Changeset 2321:3ab5e6c3d301 for inc

Timestamp:

10/09/13 15:21:14 (12 years ago)

Author:

Dsls

Branch:

twig

Message:

page layout readapted.

Location:

inc/admin

Files:

• class.dc.admincontext.php (modified) (6 diffs)
• default-templates/js_helpers.html.twig (modified) (1 diff)
• default-templates/layout.html.twig (modified) (4 diffs)
• default-templates/posts.html.twig (modified) (2 diffs)

inc/admin/class.dc.admincontext.php

@@ -63 +63 @@
           }
      }
+     
+     public function __isset($name) {
+          if ($this->isAllowed($name,$this->attributes)) {
+               return isset($this->object->$name);
+          } else {
+               return false;
+          }
+     }
+     
 
      public function __call($name,$args) {
@@ -258 +267 @@
           $p = path::info($_SERVER['REQUEST_URI']);
           $this->protected_globals['current_page'] = $p['base'];
-          $this->protected_globals['blog_count'] = $this->core->auth->blog_count;
+          $this->protected_globals['blog_count'] = $this->core->auth->getBlogCount();
           $this->protected_globals['rtl'] = l10n::getTextDirection(
                $this->protected_globals['current_user']['lang']) == 'rtl';
@@ -266 +275 @@
                'nonce' => $this->core->getNonce()
           );
-          
           # Keep protected globals safe
           return array_merge($this->globals,$this->protected_globals);
@@ -421 +429 @@
           # Blogs list
           $blogs = array();
-          if ($this->core->auth->blog_count > 1 && $this->core->auth->blog_count < 20) {
+          $blog_count = $this->core->auth->getBlogCount();
+          if ($blog_count > 1 && $blog_count < 20) {
                $blog_id = $this->core->blog->id;
                $rs_blogs = $this->core->getBlogs(array('order'=>'LOWER(blog_name)','limit'=>20));
@@ -446 +455 @@
           $sform
                ->addField(
-                    new dcFieldText('q','',array(
+                    new dcFieldText('qx','',array(
                     'maxlength'         => 255,
                     'label' => __('Search:'))))
@@ -460 +469 @@
      protected function getCurrentBlog()
      {
-          $this->protected_globals['current_blog'] = $this->core->auth->blog_count ?
-               new dcProxy($this->core->blog,array(
+          $this->protected_globals['current_blog'] = $this->core->auth->getBlogCount() ?
+               new dcProxy($this->core->blog,array('attr' => array(
                     'id','name','desc','url','host','creadt','upddt'
-               )) : array(
+               ))) : array(
                     'id'      => '',
                     'name'    => '',

inc/admin/default-templates/js_helpers.html.twig

@@ -293 +293 @@
 {% endmacro %}
 
+{% macro toggles() %}
+<script type="text/javascript">
+     //<![CDATA[
+     dotclear.unfolded_sections = { {% for section in unfolded_sections %} '{{section}}':true {% if not loop.last %},{% endif %}{% endfor %} };
+     //]]>
+</script>
+{% endmacro %}
+
 {% macro tool_man() %}
      <!-- jsToolMan -->

inc/admin/default-templates/layout.html.twig

@@ -5 +5 @@
      {% block header %}
      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-     <title>{% block title %}{{  (page_title|last).title|striptags }} - {% if current_blog.name is not empty %}{{current_blog.name}} - {% endif %}{{vendor_name}} - {{version}}{% endblock %}</title>
      <meta name="ROBOTS" content="NOARCHIVE,NOINDEX,NOFOLLOW" />
      <meta name="GOOGLEBOT" content="NOSNIPPET" />
      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+     <title>{% block title %}{{  (page_title|last).title|striptags }} - {% if current_blog.name is not empty %}{{current_blog.name}} - {% endif %}{{vendor_name}} - {{version}}{% endblock %}</title>
+     {{ js.load_IE7 }}
      <link rel="stylesheet" href="{{theme_url}}style/default.css" type="text/css" media="screen" />
      <link rel="icon" type="image/png" href="images/favicon.png" />
@@ -14 +15 @@
      <link rel="stylesheet" href="{{theme_url}}style/default-rtl.css" type="text/css" media="screen" />
      {% endif %}
-     {{ js.load_IE7 }}
      {{ js.common }}
+     {{ js.toggles }}
      {% endblock %}
 </head>
 
-<body id="dotclear-admin{% if safe_mode %} safe-mode{% endif %}">
+<body id="dotclear-admin{% if safe_mode %} safe-mode{% endif %}" class="no-js">
+     {% block prelude %}
+          <ul id="prelude">
+               <li><a href="#content">{{__('Go to the content')}}</a></li>
+               <li><a href="#main-menu">{{__('Go to the menu')}}</a></li>
+               <li><a href="#qx">{{__('Go to the search')}}</a></li>
+               <li><a href="#help">{{__('Go to help')}}</a></li>
+          </ul>
+     {% endblock %}
      <div id="header">
-          {% block prelude %}
-               <ul id="prelude">
-                    <li><a href="#content">{{__('To content')}}</a></li>
-                    <li><a href="#main-menu">{{__('To menu')}}</a></li>
-               </ul>
-          {% endblock %}
-          <div id="top"><h1><a href="index.php">{{vendor_name}}</a></h1></div>
-          <div id="info-boxes">
-               <div id="info-box1">
-                 {% form 'switchblog_menu' %}
-                    
-                    {% if blog_count > 1 and blog_count < 20 %}
-                         {{ form_field('switchblog',{},{'labelclass':'classic nomobile'}) }}
-                         <noscript>{{ form_field('switchblog_submit') }}</noscript>
-                    {% else %}
-                         {{__('Blog:')}} <strong title="{{current_blog.url}}">{{current_blog.name}}</strong>
-                         {% if blogs is not empty %} - <a href="blogs.php">{{__('Change blog')}}</a>{% endif %}
-                    {% endif %}
-                    <p class="nomobile"><a href="{{current_blog.url}}" onclick="window.open(this.href);return false;" title="{{__('Go to site')}} ({{__('new window')}})">{{__('Go to site')}} <img src="{{theme_url}}images/outgoing.png" alt="" /></a>{{form_hidden()}}</p>
-                 {% endform %}
-               </div>
-               <div id="info-box2">
-                    <a class="smallscreen{%if current_page == 'index' %} active" {% endif %}" href="index.php">{{__('My dashboard')}}</a><span class="smallscreen"> | </span>
-                    <a class="smallscreen{%if current_page == 'preferences' %} active" {% endif %}" href="preferences.php">{{__('My preferences')}}</a><span class="smallscreen"> | </span>
-                    <a href="index.php?logout=1" class="logout">{{__('Logout %s')|format(current_user.id)}} <img src="{{theme_url}}images/logout.png" alt="" /></a>
-               </div>
+     <h1><a href="index.php"><span class="hidden">{{vendor_name}}</span></a></h1>
+          {% form 'switchblog_menu' with {"id":"top-info-blog"} %}
+          {% if blog_count > 1 and blog_count < 20 %}
+               <p>{{ form_field('switchblog',{},{'labelclass':'classic '}) }} {{ form_field('switchblog_submit', {"class":"hidden-if-js"}) }}</p>
+          {% else %}
+               {{__('Blog:')}} <strong title="{{current_blog.blog_url}}">{{current_blog.blog_name}}</strong>
+               {% if blogs is not empty %} - <a href="blogs.php">{{__('Change blog')}}</a>{% endif %}
+          {% endif %}
+          <p><a class="outgoing" href="{{current_blog.url}}" title="{{__('Go to site')}}">{{__('Go to site')}} <img src="{{theme_url}}images/outgoing.png" alt="" /></a>{{form_hidden()}}</p>
+          {% endform %}
+          <ul id="top-info-user">
+          <li> <a class="smallscreen{%if current_page == 'index' %} active" {% endif %}" href="index.php">{{__('My dashboard')}}</a></li>
+          <li> <a class="smallscreen{%if current_page == 'preferences' %} active" {% endif %}" href="preferences.php">{{__('My preferences')}}</a></li>
+          <li><a href="index.php?logout=1" class="logout"><span class="nomobile">{{__('Logout %s')|format(current_user.id)}}</span> <img src="{{theme_url}}images/logout.png" alt="" /></a></li>
+          </ul>
+     </div>
+     <div id="wrapper" class="clearfix">
+          <div class="hidden-if-no-js collapser-box">
+               <a href="#" id="collapser"><img class="collapse-mm" src="images/collapser-hide.png" alt="{{ __('Hide main menu') }}" />
+               <img class="expand-mm" src="images/collapser-show.png" alt="{{__('Show main menu') }}" /></a>
           </div>
-     </div>
-     <div id="wrapper">
           <div id="main">
-               <div id="content">
+               <div id="content" class="clearfix">
                     {% block content %}
                     {% if safe_mode %}
-                         <div class="error"><h3>{{__('Safe mode')}}</h3>
+                         <div class="warning"><h3>{{__('Safe mode')}}</h3>
                          <p>{{__('You are in safe mode. All plugins have been temporarily disabled. Remind to log out then log in again normally to get back all functionalities')}}</p>
                          </div>
@@ -100 +101 @@
                {% block menus %}
                {% form 'search-menu' with {'id':'search-menu'} %}
-                    <p> {{ form_field('q',{'size':30},{'labelclass':'hidden'}) }} 
+                    <p> {{ form_field('qx',{'size':30},{'labelclass':'hidden'}) }} 
                          {{ form_field('ok') }}{{form_hidden()}}
                     </p>
@@ -126 +127 @@
           <div id="footer">
                {% block footer %}
-               <p>{{ __('Thank you for using %s.')|format(vendor_name) }}</p>
+               {% set text= __('Thank you for using %s.')|format(vendor_name~' '~version) %}
+               <a href="http://dotclear.org/" title="{{ text }}">
+               <img src="style/dc_logos/w-dotclear90.png" alt="{{ text }}" /></a>
                {% endblock %}
           </div>
      </div>
+<!-- 
+                  
+               ,;:'`'::
+            __||
+      _____/LLLL\_
+      \__________"|
+    ~^~^~^~^~^~^~^~^~^~
+ -->
      {#{% block debug %}
        {% set debug_info = debug_info() %}

inc/admin/default-templates/posts.html.twig

@@ -12 +12 @@
      {{ js.page_tabs(default_tab) }}
 {% endblock %}
-{% block prelude %}
+{#{% block prelude %}
      <ul id="prelude">
           <li><a href="#content">{{__('View this entry on site')}}</a></li>
@@ -19 +19 @@
 {% endblock %}
 
-
+#}
 
 {% block content %}