Changeset 684:3d217b8adc52 for admin

Timestamp:

08/13/11 11:46:29 (14 years ago)

Author:

Franck <carnet.franck.paul@…>

Branch:

default

Message:

Récupération

File:

• admin/blog_theme.php (modified) (3 diffs)

admin/blog_theme.php

@@ -156 +156 @@
      
      $radio_id = 'theme_'.html::escapeHTML($id);
-     $theme_url = http::concatURL($core->blog->url,$core->blog->settings->system->themes_url.'/'.$id);
+     if (preg_match('#^http(s)?://#',$core->blog->settings->system->themes_url)) {
+          $theme_url = http::concatURL($core->blog->settings->system->themes_url,'/'.$id);
+     } else {
+          $theme_url = http::concatURL($core->blog->url,$core->blog->settings->system->themes_url.'/'.$id);
+     }
      $has_conf = file_exists(path::real($core->blog->themes_path.'/'.$id).'/_config.php');
      $has_css = file_exists(path::real($core->blog->themes_path.'/'.$id).'/style.css');
@@ -212 +216 @@
 {
      echo
-     '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; '.__('Blog appearance').'</h2>';
+     '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; <span class="page-title">'.__('Blog appearance').'</span></h2>';
      
      if (!empty($_GET['upd'])) {
@@ -330 +334 @@
      echo
      '<h2>'.html::escapeHTML($core->blog->name).
-     ' &rsaquo; <a href="blog_theme.php">'.__('Blog appearance').'</a> &rsaquo; '.__('Theme configuration').'</h2>'.
+     ' &rsaquo; <a href="blog_theme.php">'.__('Blog appearance').'</a> &rsaquo; <span class="page-title">'.__('Theme configuration').'<span class="page-title"></h2>'.
      '<p><a class="back" href="blog_theme.php">'.__('back').'</a></p>';
      
      try
      {
-          # Let theme configuration set their own form(s)
-          $managed = (boolean) $core->callBehavior('adminThemeConfigManaged');
-          
-          if (!$managed)
+          # Let theme configuration set their own form(s) if required
+          $standalone_config = (boolean) $core->themes->moduleInfo($core->blog->settings->system->theme,'standalone_config');
+
+          if (!$standalone_config)
                echo '<form id="theme_config" action="blog_theme.php?conf=1" method="post" enctype="multipart/form-data">';
 
           include $theme_conf_file;
 
-          if (!$managed)
+          if (!$standalone_config)
                echo
                '<p class="clear"><input type="submit" value="'.__('Save').'" />'.
                $core->formNonce().'</p>'.
                '</form>';
+
      }
      catch (Exception $e)