Changeset 2195:70e4c0552ecc

Timestamp:

10/01/13 23:43:29 (12 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

dcRepo

Message:

Another way to toggle themes display

Files:

• admin/images/minus-theme.png (added)
• admin/images/plus-theme.png (added)
• admin/js/_blog_theme.js (modified) (1 diff)
• admin/style/default.css (modified) (1 diff)
• inc/admin/lib.dc.page.php (modified) (1 diff)
• inc/admin/lib.moduleslist.php (modified) (2 diffs)

admin/js/_blog_theme.js

@@ -1 +1 @@
 $(function() {
-     $('.module-name').not('.current-theme .module-name').each(function(){
-          $(this)
-               .toggleWithLegend($(this).parent().children('.module-infos'),{legend_click: true})
-               .toggleWithLegend($(this).parent().children('.module-actions'),{legend_click: true,
-                    img_on_src: '', img_on_alt: '', img_off_src: '', img_off_alt: ''});
+     $('.module-sshot').not('.current-theme .module-sshot').each(function(){
+          var bar = $('<div>').addClass('bloc-toggler');
+          $(this).after(
+          $(bar).toggleWithLegend($(this).parent().children('.toggle-bloc'),{
+               img_on_src: dotclear.img_plus_theme_src,
+               img_on_alt: dotclear.img_plus_theme_alt,
+               img_off_src: dotclear.img_minus_theme_src,
+               img_off_alt: dotclear.img_minus_theme_alt, 
+               legend_click: true
+          }));
      });
-/* Exemple for toggle on screenshot
-     $('.module-sshot').not('.current-theme .module-name').each(function(){
-          $(this).toggleWithLegend($(this).parent().children('.module-infos'),{
-               img_on_src: '',
-               img_on_alt: '',
-               img_off_src: '',
-               img_off_alt: '', 
-               legend_click: true
-          });
-     });
-*/
 });

admin/style/default.css

@@ -1567 +1567 @@
      margin-bottom: 1em;
      }
+.bloc-toggler {
+     text-align: center;
+}
 /* ------------------------------------------------------------------ categories.php */
 #categories {

inc/admin/lib.dc.page.php

@@ -528 +528 @@
           self::jsVar('dotclear.img_menu_on','images/menu_on.png').
           self::jsVar('dotclear.img_menu_off','images/menu_off.png').
+          
+          self::jsVar('dotclear.img_plus_theme_src','images/plus-theme.png').
+          self::jsVar('dotclear.img_plus_theme_alt',__('uncover')).
+          self::jsVar('dotclear.img_minus_theme_src','images/minus-theme.png').
+          self::jsVar('dotclear.img_minus_theme_alt',__('hide')).
 
           self::jsVar('dotclear.msg.help',

inc/admin/lib.moduleslist.php

@@ -884 +884 @@
                }
 
+               if (in_array('sshot', $cols)) {
+                    # Screenshot from url
+                    if (preg_match('#^http(s)?://#', $module['sshot'])) {
+                         $sshot = $module['sshot'];
+                    }
+                    # Screenshot from installed module
+                    elseif (file_exists($this->core->blog->themes_path.'/'.$id.'/screenshot.jpg')) {
+                         $sshot = $this->getPageURL('shot='.rawurlencode($id));
+                    }
+                    # Default screenshot
+                    else {
+                         $sshot = 'images/noscreenshot.png';
+                    }
+
+                    $line .= 
+                    '<div class="module-sshot"><img src="'.$sshot.'" alt="'.__('screenshot.').'" /></div>';
+               }
+
                $line .= 
-               '<div class="module-infos">'.
+               '<div class="module-infos toggle-bloc">'.
                '<p>';
 
@@ -918 +936 @@
                '</div>';
 
-               if (in_array('sshot', $cols)) {
-                    # Screenshot from url
-                    if (preg_match('#^http(s)?://#', $module['sshot'])) {
-                         $sshot = $module['sshot'];
-                    }
-                    # Screenshot from installed module
-                    elseif (file_exists($this->core->blog->themes_path.'/'.$id.'/screenshot.jpg')) {
-                         $sshot = $this->getPageURL('shot='.rawurlencode($id));
-                    }
-                    # Default screenshot
-                    else {
-                         $sshot = 'images/noscreenshot.png';
-                    }
-
-                    $line .= 
-                    '<div class="module-sshot"><img src="'.$sshot.'" alt="'.__('screenshot.').'" /></div>';
-               }
-
                $line .= 
-               '<div class="module-actions">';
+               '<div class="module-actions toggle-bloc">';
                
                # _GET actions