Changeset 2196:234c9e083cfb for inc/admin

Timestamp:

10/02/13 00:10:37 (12 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

dcRepo

Parents:

2195:70e4c0552ecc (diff), 2191:f3ecd85d5c32 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from default

Files:

• inc/admin/lib.dc.page.php (modified) (2 diffs)
• inc/admin/lib.dc.page.php (modified) (2 diffs)

inc/admin/lib.dc.page.php

@@ -571 +571 @@
           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',
@@ -654 +659 @@
           self::jsVar('dotclear.msg.load_enhanced_uploader',
                __('Loading enhanced uploader, please wait.')).
+
+          self::jsVar('dotclear.msg.module_author',
+               __('Author:')).
+          self::jsVar('dotclear.msg.module_details',
+               __('Details')).
+          self::jsVar('dotclear.msg.module_support',
+               __('Support')).
+          self::jsVar('dotclear.msg.module_help',
+               __('Help:')).
+          self::jsVar('dotclear.msg.module_section',
+               __('Section:')).
+          self::jsVar('dotclear.msg.module_tags',
+               __('Tags:')).
                "\n//]]>\n".
           "</script>\n";

inc/admin/lib.dc.page.php

@@ -175 +175 @@
                '</div>';
           }
+
+          if (isset($_SESSION['notifications'])) {
+               $types = array("success" => "success", "warning" => "warning-msg", "error" => "error");
+               $notifications = $_SESSION['notifications'];
+               foreach ($types as $type => $class) {
+                    if (isset($notifications[$type])) {
+                         foreach ($notifications[$type] as $n) {
+                              echo self::getNotification($n,$class);
+                         }
+                    }
+               }
+               unset($_SESSION['notifications']);
+          }
+     }
+
+     public static function AddNotice($type,$message)
+     {
+          $notification = isset($_SESSION['notifications']) ? $_SESSION['notifications'] : array();
+          $notification[$type][] = array('ts' => time(), 'text' => $message);
+          $_SESSION['notifications'] = $notification;
+     }
+
+     public static function addSuccessNotice($message)
+     {
+          self::addNotice("success",$message);
+     }
+
+     public static function addWarningNotice($message)
+     {
+          self::addNotice("warning",$message);
+     }
+
+     public static function addErrorNotice($message)
+     {
+          self::addNotice("error",$message);
+     }
+
+     protected static function getNotification($msg,$class)
+     {
+          global $core;
+
+          $res = '<p class="'.$class.'">'.dt::str(__('[%H:%M:%S]'),$msg['ts'],$core->auth->getInfo('user_tz')).' '.$msg['text'].'</p>';
+          return $res;
      }
 
@@ -336 +379 @@
           if ($msg != '') {
                $res = ($div ? '<div class="'.$class.'">' : '').'<p'.($div ? '' : ' class="'.$class.'"').'>'.
-               ($timestamp ? dt::str(__('%H:%M:%S:'),null,$core->auth->getInfo('user_tz')).' ' : '').$msg.
+               ($timestamp ? dt::str(__('[%H:%M:%S]'),null,$core->auth->getInfo('user_tz')).' ' : '').$msg.
                '</p>'.($div ? '</div>' : '');
                if ($echo) {