Changeset 2261:e7aa9cffbc30

Timestamp:

10/04/13 18:11:26 (12 years ago)

Author:

Anne Kozlika <kozlika@…>

Branch:

dcRepo

Children:

2267:e59137433afb, 2268:daa30c459777

Parents:

2259:6aaea2c2e0f7 (diff), 2260:592e42e0b7fb (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

Files:

• inc/admin/lib.moduleslist.php (modified) (3 diffs)
• inc/admin/lib.moduleslist.php (modified) (6 diffs)

inc/admin/lib.moduleslist.php

@@ -1210 +1210 @@
                if ($has_details || $has_support) {
                     $line .=
-                    '<span class="mod-more">'.__('Help:').' ';
+                    '<span class="mod-more">';
 
                     if ($has_details) {
@@ -1245 +1245 @@
                     }
 
+                    $line .= '<div class="current-actions">';
+
                     if (file_exists(path::real($this->core->blog->themes_path.'/'.$id).'/_config.php')) {
                          $line .= 
@@ -1253 +1255 @@
                     $line .= 
                     $this->core->callBehavior('adminCurrentThemeDetails', $this->core, $id, $module);
+
+                    $line .= '</div>';
                }
 

inc/admin/lib.moduleslist.php

@@ -42 +42 @@
      protected $page_qs = '?';                    /**< @var string    Page query string */
      protected $page_tab = '';                    /**< @var string    Page tab */
+     protected $page_redir = '';                  /**< @var string    Page redirection */
 
      public static $nav_indexes = 'abcdefghijklmnopqrstuvwxyz0123456789'; /**< @var  string    Index list */
@@ -203 +204 @@
      {
           return $this->page_tab;
+     }
+
+     /**
+      * Set page redirection.
+      *
+      * @param string    $default       Default redirection
+      * @return     adminModulesList self instance
+      */
+     public function setRedir($default='')
+     {
+          $this->page_redir = empty($_REQUEST['redir']) ? $default : $_REQUEST['redir'];
+
+          return $this;
+     }
+
+     /**
+      * Get page redirection.
+      *
+      * @return     Page redirection
+      */
+     public function getRedir()
+     {
+          return empty($this->page_redir) ? $this->getURL() : $this->page_redir;
      }
      //@}
@@ -1004 +1028 @@
                return null;
           }
+          $this->setRedir($this->getURL().'#plugins');
 
           ob_start();
@@ -1036 +1061 @@
      {
           if ($this->config_file) {
-               $redir = empty($_REQUEST['redir']) ? $this->getURL().'#plugins' : $_REQUEST['redir'];
 
                if (!$this->config_module['standalone_config']) {
@@ -1042 +1066 @@
                     '<form id="module_config" action="'.$this->getURL('conf=1').'" method="post" enctype="multipart/form-data">'.
                     '<h3>'.sprintf(__('Configure plugin "%s"'), html::escapeHTML($this->config_module['name'])).'</h3>'.
-                    '<p><a class="back" href="'.$redir.'">'.__('Back').'</a></p>';
+                    '<p><a class="back" href="'.$this->getRedir().'">'.__('Back').'</a></p>';
                }
 
@@ -1051 +1075 @@
                     '<p class="clear"><input type="submit" name="save" value="'.__('Save').'" />'.
                     form::hidden('module', $this->config_module['id']).
-                    form::hidden('redir', $redir).
+                    form::hidden('redir', $this->getRedir()).
                     $this->core->formNonce().'</p>'.
                     '</form>';