Permalink
Browse files

Merge pull request #6 from Bojch/1.1/develop

1.1/develop
  • Loading branch information...
2 parents a80196a + ac81b27 commit 3ffb6c768358cc04fca32da7ed38c973b8a15fdf @rpnzl committed Nov 1, 2012
Showing with 392 additions and 356 deletions.
  1. +3 −1 .gitignore
  2. +0 −75 css/default.css
  3. +287 −0 css/nivo-slider.theme.css
  4. +0 −100 css/orman.css
  5. +0 −104 css/pascal.css
  6. +45 −0 events.php
  7. +15 −0 language/slovenian/sliders_lang.php
  8. +26 −37 widgets/slider/slider.php
  9. +14 −16 widgets/slider/views/display.php
  10. +2 −23 widgets/slider/views/form.php
View
@@ -1 +1,3 @@
-.DS_Store
+.DS_Store
+/nbproject/private/
+/nbproject
View
@@ -1,75 +0,0 @@
-/*
-Skin Name: Nivo Slider Default Theme
-Skin URI: http://nivo.dev7studios.com
-Skin Type: flexible
-Description: The default skin for the Nivo Slider.
-Version: 1.0
-Author: Gilbert Pellegrom
-Author URI: http://dev7studios.com
-*/
-
-.theme-default .nivoSlider {
- position:relative;
- background:#fff url(../img/nivoDefault/loading.gif) no-repeat 50% 50%;
- margin-bottom:50px;
- -webkit-box-shadow: 0px 1px 5px 0px #4a4a4a;
- -moz-box-shadow: 0px 1px 5px 0px #4a4a4a;
- box-shadow: 0px 1px 5px 0px #4a4a4a;
-}
-.theme-default .nivoSlider img {
- position:absolute;
- top:0px;
- left:0px;
- display:none;
-}
-.theme-default .nivoSlider a {
- border:0;
- display:block;
-}
-
-.theme-default .nivo-controlNav {
- position:absolute;
- left:50%;
- bottom:-42px;
- margin-left:-40px; /* Tweak this to center bullets */
-}
-.theme-default .nivo-controlNav a {
- display:block;
- width:22px;
- height:22px;
- background:url(../img/nivoDefault/bullets.png) no-repeat;
- text-indent:-9999px;
- border:0;
- margin-right:3px;
- float:left;
-}
-.theme-default .nivo-controlNav a.active {
- background-position:0 -22px;
-}
-
-.theme-default .nivo-directionNav a {
- display:block;
- width:30px;
- height:30px;
- background:url(../img/nivoDefault/arrows.png) no-repeat;
- text-indent:-9999px;
- border:0;
-}
-.theme-default a.nivo-nextNav {
- background-position:-30px 0;
- right:15px;
-}
-.theme-default a.nivo-prevNav {
- left:15px;
-}
-
-.theme-default .nivo-caption {
- font-family: Helvetica, Arial, sans-serif;
-}
-.theme-default .nivo-caption a {
- color:#fff;
- border-bottom:1px dotted #fff;
-}
-.theme-default .nivo-caption a:hover {
- color:#fff;
-}
View
@@ -0,0 +1,287 @@
+/*
+Skin Name: Nivo Slider Default Theme
+Skin URI: http://nivo.dev7studios.com
+Skin Type: flexible
+Description: The default skin for the Nivo Slider.
+Version: 1.0
+Author: Gilbert Pellegrom
+Author URI: http://dev7studios.com
+*/
+
+.theme-default .nivoSlider {
+ position:relative;
+ background:#fff url(../img/nivoDefault/loading.gif) no-repeat 50% 50%;
+ margin-bottom:50px;
+ -webkit-box-shadow: 0px 1px 5px 0px #4a4a4a;
+ -moz-box-shadow: 0px 1px 5px 0px #4a4a4a;
+ box-shadow: 0px 1px 5px 0px #4a4a4a;
+}
+.theme-default .nivoSlider img {
+ position:absolute;
+ top:0px;
+ left:0px;
+ display:none;
+}
+.theme-default .nivoSlider a {
+ border:0;
+ display:block;
+}
+
+.theme-default .nivo-controlNav {
+ position:absolute;
+ left:50%;
+ bottom:-42px;
+ margin-left:-40px; /* Tweak this to center bullets */
+}
+.theme-default .nivo-controlNav a {
+ display:block;
+ width:22px;
+ height:22px;
+ background:url(../img/nivoDefault/bullets.png) no-repeat;
+ text-indent:-9999px;
+ border:0;
+ margin-right:3px;
+ float:left;
+}
+.theme-default .nivo-controlNav a.active {
+ background-position:0 -22px;
+}
+
+.theme-default .nivo-directionNav a {
+ display:block;
+ width:30px;
+ height:30px;
+ background:url(../img/nivoDefault/arrows.png) no-repeat;
+ text-indent:-9999px;
+ border:0;
+}
+.theme-default a.nivo-nextNav {
+ background-position:-30px 0;
+ right:15px;
+}
+.theme-default a.nivo-prevNav {
+ left:15px;
+}
+
+.theme-default .nivo-caption {
+ font-family: Helvetica, Arial, sans-serif;
+}
+.theme-default .nivo-caption a {
+ color:#fff;
+ border-bottom:1px dotted #fff;
+}
+.theme-default .nivo-caption a:hover {
+ color:#fff;
+}
+
+
+
+/*
+Skin Name: Pascal Theme
+Skin URI: http://nivo.dev7studios.com
+Skin Type: fixed
+Image Width: 630
+Image Height: 235
+Description: A nice, light skin for the Nivo Slider.
+Version: 1.0
+Author: Gilbert Pellegrom & Pascal Gartner
+Author URI: http://dev7studios.com
+*/
+
+.theme-pascal.slider-wrapper {
+ background:url(../img/pascal/slider.png) no-repeat;
+ width:668px;
+ height:299px;
+ margin:0 auto;
+ padding-top:17px;
+ position:relative;
+}
+
+.theme-pascal .nivoSlider {
+ position:relative;
+ width:630px;
+ height:235px;
+ margin-left:19px;
+ background:url(../img/pascal/loading.gif) no-repeat 50% 50%;
+}
+.theme-pascal .nivoSlider img {
+ position:absolute;
+ top:0px;
+ left:0px;
+ display:none;
+ width:630px; /* Make sure your images are the same size */
+ height:235px; /* Make sure your images are the same size */
+}
+.theme-pascal .nivoSlider a {
+ border:0;
+ display:block;
+}
+
+.theme-pascal .nivo-controlNav {
+ background:url(../img/pascal/controlnav.png) no-repeat;
+ width:251px;
+ height:40px;
+ position:absolute;
+ left:200px; /* Tweak this to center bullets */
+ bottom:-42px;
+ padding:8px 0 0 82px;
+ z-index:20;
+}
+.theme-pascal .nivo-controlNav a {
+ display:block;
+ width:22px;
+ height:22px;
+ background:url(../img/pascal/bullets.png) no-repeat;
+ text-indent:-9999px;
+ border:0;
+ margin-right:3px;
+ float:left;
+}
+.theme-pascal .nivo-controlNav a.active {
+ background-position:0 -22px;
+}
+
+.theme-pascal .nivo-directionNav a {
+ display:none;
+}
+
+.theme-pascal .nivo-caption {
+ bottom:40%;
+ left:auto;
+ right:0px;
+ width:auto;
+ max-width:630px;
+ overflow:hidden;
+ background:#fff;
+ text-shadow:none;
+ font-family: arial, serif;
+ color:#4c4b4b;
+}
+.theme-pascal .nivo-caption p {
+ padding:5px 15px;
+ color:#333;
+ font-weight:bold;
+ font-size:27px;
+ text-transform:uppercase;
+}
+.theme-pascal .nivo-caption a {
+ color:#333;
+ font-weight:bold;
+ font-size:27px;
+ text-transform:uppercase;
+}
+
+.theme-pascal .ribbon {
+ background:url(../img/pascal/ribbon.png) no-repeat;
+ width:111px;
+ height:111px;
+ position:absolute;
+ top:-8px;
+ left:-8px;
+ z-index:300;
+}
+
+
+
+
+
+/*
+Skin Name: Orman Theme
+Skin URI: http://nivo.dev7studios.com
+Skin Type: fixed
+Image Width: 568
+Image Height: 268
+Description: A light and green skin for the Nivo Slider.
+Version: 1.0
+Author: Gilbert Pellegrom & Orman Clark
+Author URI: http://dev7studios.com
+*/
+
+.theme-orman.slider-wrapper {
+ background:url(../img/orman/slider.png) no-repeat;
+ width:722px;
+ height:337px;
+ margin:0 auto;
+ padding-top:18px;
+ position:relative;
+}
+
+.theme-orman .nivoSlider {
+ position:relative;
+ width:568px;
+ height:268px;
+ margin-left:77px;
+ background:url(../img/orman/loading.gif) no-repeat 50% 50%;
+}
+.theme-orman .nivoSlider img {
+ position:absolute;
+ top:0px;
+ left:0px;
+ display:none;
+ width:568px; /* Make sure your images are the same size */
+ height:268px; /* Make sure your images are the same size */
+}
+.theme-orman .nivoSlider a {
+ border:0;
+ display:block;
+}
+
+.theme-orman .nivo-controlNav {
+ position:absolute;
+ left:50%;
+ bottom:-60px;
+ margin-left:-30px; /* Tweak this to center bullets */
+}
+.theme-orman .nivo-controlNav a {
+ display:block;
+ width:10px;
+ height:10px;
+ background:url(../img/orman/bullets.png) no-repeat;
+ text-indent:-9999px;
+ border:0;
+ margin-right:7px;
+ float:left;
+}
+.theme-orman .nivo-controlNav a.active {
+ background-position:0 -10px;
+}
+
+.theme-orman .nivo-directionNav a {
+ display:block;
+ width:25px;
+ height:200px;
+ background:url(../img/orman/arrows.png) no-repeat 0% 50%;
+ text-indent:-9999px;
+ border:0;
+ top:40px;
+}
+.theme-orman a.nivo-nextNav {
+ background-position:100% 50%;
+ right:-40px;
+ padding-right:20px;
+}
+.theme-orman a.nivo-prevNav {
+ left:-40px;
+ padding-left:20px;
+}
+
+.theme-orman .nivo-caption {
+ font-family: Helvetica, Arial, sans-serif;
+}
+.theme-orman .nivo-caption a {
+ color:#fff;
+ border-bottom:1px dotted #fff;
+}
+.theme-orman .nivo-caption a:hover {
+ color:#fff;
+}
+
+.theme-orman .ribbon {
+ background:url(../img/orman/ribbon.png) no-repeat;
+ width:111px;
+ height:111px;
+ position:absolute;
+ top:-3px;
+ left:56px;
+ z-index:300;
+}
Oops, something went wrong.

0 comments on commit 3ffb6c7

Please sign in to comment.