Changeset 2189:eda746478da6

Timestamp:

10/01/13 16:39:40 (12 years ago)

Author:

Dsls

Branch:

default

Message:

• Removed superfluous space in addNotice
• Non-repeatable notifications, step 2 : blogs and categories
• Fixed blogs breadcrumb

see #1710

Files:

• admin/blog.php (modified) (1 diff)
• admin/blog_del.php (modified) (1 diff)
• admin/blog_pref.php (modified) (3 diffs)
• admin/blog_theme.php (modified) (3 diffs)
• admin/blogs.php (modified) (1 diff)
• admin/categories.php (modified) (6 diffs)
• admin/category.php (modified) (4 diffs)
• inc/admin/lib.dc.page.php (modified) (2 diffs)

admin/blog.php

@@ -51 +51 @@
           # --BEHAVIOR-- adminAfterBlogCreate
           $core->callBehavior('adminAfterBlogCreate',$cur,$blog_id,$blog_settings);
-          
-          http::redirect('blog.php?id='.$cur->blog_id.'&add=1');
+          dcPage::addSuccessNotice(sprintf(__('Blog "%s" successfully created'), html::escapeHTML($cur->blog_name)));
+          http::redirect('blog.php?id='.$cur->blog_id);
      }
      catch (Exception $e)

admin/blog_del.php

@@ -42 +42 @@
           try {
                $core->delBlog($blog_id);
-               http::redirect('blogs.php?del=1');
+               dcPage::addSuccessNotice(sprintf(__('Blog "%s" successfully deleted'), html::escapeHTML($blog_name)));
+
+               http::redirect('blogs.php');
           } catch (Exception $e) {
                $core->error->add($e->getMessage());

admin/blog_pref.php

@@ -27 +27 @@
      
      $action = 'blog_pref.php';
-     $redir = 'blog_pref.php?upd=1';
+     $redir = 'blog_pref.php';
 }
 else
@@ -56 +56 @@
      
      $action = 'blog.php';
-     $redir = 'blog.php?id=%s&upd=1';
+     $redir = 'blog.php?id=%s';
 }
 
@@ -257 +257 @@
                $blog_settings->system->put('url_scan',$_POST['url_scan']);
           }
-          
+          dcPage::addSuccessNotice(__('Blog has been successfully updated.'));
+
           http::redirect(sprintf($redir,$blog_id));
      }

admin/blog_theme.php

@@ -53 +53 @@
      $core->blog->settings->system->put('theme',$_POST['theme']);
      $core->blog->triggerBlog();
-     http::redirect('blog_theme.php?upd=1');
+     $theme = $core->themes->getModules($_POST['theme']);
+     dcPage::addSuccessNotice(sprintf(
+          __('Current theme has been successfully changed to "%s".'),
+          __('Current theme has been successfully changed to "%s".'),
+          html::escapeHTML($theme['name']))
+     );
+
+     http::redirect('blog_theme.php');
 }
 
@@ -78 +85 @@
           $core->callBehavior('themeAfterDelete',$theme);
           
-          http::redirect('blog_theme.php?del=1');
+          http::redirect('blog_theme.php');
      }
      catch (Exception $e)
@@ -128 +135 @@
           
           $ret_code = dcModules::installPackage($dest,$core->themes);
-          http::redirect('blog_theme.php?added='.$ret_code);
+          if ($ret_code == 2) {
+               dcPage::addSuccessNotice(__('Theme has been successfully upgraded.'));
+          } else {
+               dcPage::addSuccessNotice(__('Theme has been successfully installed.'));
+          }
+          http::redirect('blog_theme.php');
      }
      catch (Exception $e)

admin/blogs.php

@@ -88 +88 @@
           array(
                __('System') => '',
-               __('List of blogs')
+               __('List of blogs') => ''
           ))
 );

admin/categories.php

@@ -23 +23 @@
      $c = $core->blog->getCategory((integer) $cat_id);
      if ($c->isEmpty()) {
-          http::redirect('categories.php?unknown=1');
-     }
+          dcPage::addErrorNotice(__('This category does not exist.'));
+          http::redirect('categories.php');
+     }
+     $name = $c->cat_title;
      unset($c);
 
@@ -30 +32 @@
           # Delete category
           $core->blog->delCategory($cat_id);
-          http::redirect('categories.php?del=1');
+          dcPage::addSuccessNotice(sprintf(__('The category "%s" has been successfully deleted.'),html::escapeHTML($name)));
+          http::redirect('categories.php');
      } catch (Exception $e) {
           $core->error->add($e->getMessage());
@@ -50 +53 @@
                     throw new Exception(__('Category where to move posts does not exist'));
                }
+               $name = $c->cat_title;
                unset($c);
           }
@@ -56 +60 @@
                $core->blog->changePostsCategory($cat_id,$mov_cat);
           }
-          http::redirect('categories.php?move=1');
+          dcPage::addSuccessNotice(sprintf(__('The entries have been successfully moved to category "%s"'),
+               html::escapeHTML($name)));
+          http::redirect('categories.php');
      } catch (Exception $e) {
           $core->error->add($e->getMessage());
@@ -81 +87 @@
      {
           $core->blog->resetCategoriesOrder();
-          http::redirect('categories.php?reord=1');
+          dcPage::addSuccessNotice(__('Categories have been successfully reordered.'));
+          http::redirect('categories.php');
      }
      catch (Exception $e)
@@ -116 +123 @@
 if (!empty($_GET['reord'])) {
      dcPage::success(__('Categories have been successfully reordered.'));
-}
-if (!empty($_GET['unknown'])) {
-     dcPage::error(__('This category does not exist.'));
 }
 if (!empty($_GET['move'])) {

admin/category.php

@@ -84 +84 @@
           try {
                $core->blog->setCategoryParent($cat_id,$new_parent);
-               http::redirect('categories.php?moved=1');
+               dcPage::addSuccessNotice(__('The category has been successfully moved'));
+               http::redirect('categories.php');
           } catch (Exception $e) {
                $core->error->add($e->getMessage());
@@ -96 +97 @@
      try {
           $core->blog->setCategoryPosition($cat_id,(integer) $_POST['cat_sibling'],$_POST['cat_move']);
-          http::redirect('categories.php?moved=1');
+          dcPage::addSuccessNotice(__('The category has been successfully moved'));
+          http::redirect('categories.php');
      } catch (Exception $e) {
           $core->error->add($e->getMessage());
@@ -132 +134 @@
                $core->callBehavior('adminAfterCategoryUpdate',$cur,$cat_id);
                
-               http::redirect('category.php?id='.$_POST['id'].'&upd=1');
+               dcPage::addSuccessNotice(__('The category has been successfully updated.'));
+
+               http::redirect('category.php?id='.$_POST['id']);
           }
           # Create category
@@ -145 +149 @@
                $core->callBehavior('adminAfterCategoryCreate',$cur,$id);
                
-               http::redirect('categories.php?add=1');
+               dcPage::addSuccessNotice(sprintf(__('The category "%s" has been successfully created.'),
+                    html::escapeHTML($cur->cat_title)));
+               http::redirect('categories.php');
           }
      }

inc/admin/lib.dc.page.php

@@ -177 +177 @@
           
           if (isset($_SESSION['notifications'])) {
-               $types = array("success" => "success", "warning" => "warning-msg");
+               $types = array("success" => "success", "warning" => "warning-msg", "error" => "error");
                $notifications = $_SESSION['notifications'];
                foreach ($types as $type => $class) {
@@ -201 +201 @@
           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'].
+          dt::str(__('[%H:%M:%S]'),$msg['ts'],$core->auth->getInfo('user_tz')).' '.$msg['text'].
           '</p>';
           return $res;