Changeset 193749

Timestamp:

01/14/2010 03:50:29 AM (16 years ago)

Author:

malcalevak

Message:

Modifications to support ordering of caption text.
Note previous revision also added donate link (including support for translations of buttons...need to add translations)

Location:

wp-slimbox2/trunk

Files:

• adminmenu.php (modified) (3 diffs)
• adminpage.php (modified) (4 diffs)
• javascript/slimbox2_autoload.js (modified) (2 diffs)

wp-slimbox2/trunk/adminmenu.php

@@ -19 +19 @@
         'imageFadeDuration' => get_option('wp_slimbox_imageFadeDuration'),
         'captionAnimationDuration'   => get_option('wp_slimbox_captionAnimationDuration'),
-        'caption1' => 'a-title',
-        'caption2' => 'img-alt',
-        'caption3' => 'img-title',
-        'caption4' => 'None',
+        'caption' => array('a-title','img-alt','img-title','None'),
         'url' => 'on',
         'counterText' => get_option('wp_slimbox_counterText'),
@@ -66 +63 @@
         'imageFadeDuration' => '400',
         'captionAnimationDuration'   => '400',
-        'caption1' => 'a-title',
-        'caption2' => 'img-alt',
-        'caption3' => 'img-title',
-        'caption4' => 'None',
+        'caption' => array('a-title','img-alt','img-title','None'),
         'url' => 'on',
         'counterText' => __('Image {x} of {y}', 'wp-slimbox2'),
@@ -82 +76 @@
     ));
 }
-if (!$options->get_option('caption1')){
+if (!$options->get_option('caption')){
     $options->init_option(array(
-        'caption1' => 'a-title',
-        'caption2' => 'img-alt',
-        'caption3' => 'img-title',
-        'caption4' => 'None',
+        'caption' => array('a-title','img-alt','img-title','None'),
         'url' => 'on',
         'mobile' => 'off'
     ));
 }
+    $options->init_option(array(
+        'caption' => array('a-title','img-alt','img-title','None'),
+        'url' => 'on',
+        'mobile' => 'off'
+    ));
+    print_r ($options->get_option('caption'));
 ?>

wp-slimbox2/trunk/adminpage.php

@@ -8 +8 @@
     //choose caption source
     //combine selection of lightbox and any non-lightboxed images into single selector
+    /*http://striderweb.com/nerdaphernalia/2008/07/consolidate-options-with-arrays/
+    $caption = '';
+for ($i = 0; $i<4; $i++) {
+    switch (slimbox2_options['caption'][$i]) {
+        case 'a-title':
+            $caption .= 'el.title';
+            break;
+        case 'img-alt':
+            $caption .= 'el.firstChild.alt';
+            break;
+        case 'img-title':
+            $caption .= 'el.firstChild.title';
+            break;
+        default:
+            $caption .= '';
+    }
+    if($i < 3) $caption .= ' || ';
+}
+    */
 ?>
 <div class="wrap">
@@ -32 +51 @@
                 'picasaweb' => $_POST['wp_slimbox_picasaweb'],
                 'flickr'   => $_POST['wp_slimbox_flickr'],
-                'caption1' => $_POST['wp_slimbox_caption1'],
-                'caption2' => $_POST['wp_slimbox_caption2'],
-                'caption3' => $_POST['wp_slimbox_caption3'],
-                'caption4' => $_POST['wp_slimbox_caption4'],
+                'caption' => array($_POST['wp_slimbox_caption1'],$_POST['wp_slimbox_caption2'],$_POST['wp_slimbox_caption3'],$_POST['wp_slimbox_caption4']),
                 'url' => $_POST['wp_slimbox_url'],
                 'mobile' => $_POST['wp_slimbox_mobile'],
@@ -59 +75 @@
             <tr>
                 <th scope="col" colspan="2"><?php _e('Setting', 'wp-slimbox2'); ?></th>
-                <th scope="col"><?php _e('caption', 'wp-slimbox2'); ?></th>
+                <th scope="col"><?php _e('Description', 'wp-slimbox2'); ?></th>
             </tr>
             </thead>
@@ -216 +232 @@
                 <th scope='row' class='check-column'>
                     <select name="wp_slimbox_caption1">
-                    <?php selectionGen($options->get_option('caption1'),$caption); ?>
+                    <?php print_r($options->get_option('caption'));// selectionGen($options->get_option('caption')[0],$caption); ?>
                     </select>
                     <select name="wp_slimbox_caption2">
-                    <?php selectionGen($options->get_option('caption2'),$caption); ?>
+                    <?php// selectionGen($options->get_option('caption')[1],$caption); ?>
                     </select>
                     <select name="wp_slimbox_caption3">
-                    <?php selectionGen($options->get_option('caption3'),$caption); ?>
+                    <?php //selectionGen($options->get_option('caption')[2],$caption); ?>
                     </select>
                     <select name="wp_slimbox_caption4">
-                    <?php selectionGen($options->get_option('caption4'),$caption); ?>
+                    <?php// selectionGen($options->get_option('caption')[3],$caption); ?>
                     </select>
                 </th>

wp-slimbox2/trunk/javascript/slimbox2_autoload.js

@@ -58 +58 @@
                     return /\.(jpeg|bmp|jpg|png|gif)(\?[\d\w=&]*)?$/i.test(this.href);
                 }).unbind("click").slimbox(options, function(el) {
-                        return [el.href, (slimbox2_options['url'])?'<a href="' + el.href + '">'+el.title+'</a>':el.title];
+            var caption = (slimbox2_options['caption1']=='a-title')?el.title:(slimbox2_options['caption1']=='img-alt')?el.firstChild.alt:(slimbox2_options['caption1']=='img-title')?:'' ||
+            (slimbox2_options['caption2']=='a-title')?el.title:(slimbox2_options['caption2']=='img-alt')?el.firstChild.alt:(slimbox2_options['caption2']=='img-title')?:'' ||
+            (slimbox2_options['caption3']=='a-title')?el.title:(slimbox2_options['caption3']=='img-alt')?el.firstChild.alt:(slimbox2_options['caption3']=='img-title')?:'' ||
+            (slimbox2_options['caption4']=='a-title')?el.title:(slimbox2_options['caption4']=='img-alt')?el.firstChild.alt:(slimbox2_options['caption4']=='img-title')?:'' || ''
+                        return [el.href, (slimbox2_options['url'])?'<a href="' + el.href + '">'+caption+'</a>':+caption];
                     }, function(el) {
                         return (this == el) || ($(this).parents("div.post, div#page")[0] && ($(this).parents("div.post, div#page")[0] == $(el).parents("div.post, div#page")[0]));
@@ -64 +68 @@
         } else {
             $("a[rel^='lightbox']").unbind("click").slimbox(options, function(el) {
-                        return [el.href, (slimbox2_options['url'])?'<a href="' + el.href + '">'+el.title+'</a>':el.title];
+            var caption = (slimbox2_options['caption1']=='a-title')?el.title:(slimbox2_options['caption1']=='img-alt')?el.firstChild.alt:(slimbox2_options['caption1']=='img-title')?:'' ||
+            (slimbox2_options['caption2']=='a-title')?el.title:(slimbox2_options['caption2']=='img-alt')?el.firstChild.alt:(slimbox2_options['caption2']=='img-title')?:'' ||
+            (slimbox2_options['caption3']=='a-title')?el.title:(slimbox2_options['caption3']=='img-alt')?el.firstChild.alt:(slimbox2_options['caption3']=='img-title')?:'' ||
+            (slimbox2_options['caption4']=='a-title')?el.title:(slimbox2_options['caption4']=='img-alt')?el.firstChild.alt:(slimbox2_options['caption4']=='img-title')?:'' || '')
+                        return [el.href, (slimbox2_options['url'])?'<a href="' + el.href + '">'+caption+'</a>'+caption];
                     }, function(el) {
                 return (this == el) || ((this.rel.length > 8) && (this.rel == el.rel));