Changeset 1060:84da1bab9dca for inc

Timestamp:

12/10/12 05:32:40 (13 years ago)

Author:

JcDenis

Branch:

twig

Message:

• Still play with the main layout

Location:

inc/admin

Files:

• class.dc.admincontext.php (modified) (3 diffs)
• default-templates/layout.html.twig (modified) (4 diffs)
• default-templates/style/default.css (modified) (1 diff)

inc/admin/class.dc.admincontext.php

@@ -41 +41 @@
                
                'version'           => DC_VERSION,
-               'vendor_name'  => DC_VENDOR_NAME,
-               
-               # Blogs list (not available yet)
-               'blogs' => array(),
-               
-               # Current blog (not available yet and never available in auth.php)
-               'blog' => array(
-                    'id'      => '',
-                    'host'    => '',
-                    'url'     => '',
-                    'name'    => ''
-               )
+               'vendor_name'  => DC_VENDOR_NAME
           );
      }
@@ -140 +129 @@
      public function getGlobals()
      {
-          # Blogs list
-          if ($this->core->auth->blog_count > 1 && $this->core->auth->blog_count < 20) {
-               $rs_blogs = $core->getBlogs(array('order'=>'LOWER(blog_name)','limit'=>20));
-               while ($rs_blogs->fetch()) {
-                    $this->protected_globals['blogs'][html::escapeHTML($rs_blogs->blog_name.' - '.$rs_blogs->blog_url)] = $rs_blogs->blog_id;
-               }
-          }
-          # Current blog
-          if ($this->core->auth->blog_count) {
-               $this->protected_globals['blog'] = array(
-                    'id'      => $this->core->blog->id,
-                    'host'    => $this->core->blog->host,
-                    'url'     => $this->core->blog->url,
-                    'name'    => $this->core->blog->name
-               );
-          }
+          $this->getBlogs();
+          $this->getCurrentBlog();
+          $this->getCurrentUser();
+          
+          # Additional globals
+          $p = path::info($_SERVER['REQUEST_URI']);
+          $this->protected_globals['current_page'] = $p['base'];
+          $this->protected_globals['blog_count'] = $this->core->auth->blog_count;
+          
           # Keep protected globals safe
           return array_merge($this->globals,$this->protected_globals);
@@ -222 +204 @@
           }
      }
+     
+     /**
+      * Get list of blogs
+      */
+     protected function getBlogs()
+     {
+          # Blogs list
+          $blogs = array();
+          if ($this->core->auth->blog_count > 1 && $this->core->auth->blog_count < 20) {
+               $rs_blogs = $this->core->getBlogs(array('order'=>'LOWER(blog_name)','limit'=>20));
+               while ($rs_blogs->fetch()) {
+                    $blogs[$rs_blogs->blog_id] = $rs_blogs->blog_name.' - '.$rs_blogs->blog_url;
+                    $this->protected_globals['blogs'][$rs_blogs->blog_id] = array(
+                         'id'      => $rs_blogs->blog_id,
+                         'name'    => $rs_blogs->blog_name,
+                         'desc'    => $rs_blogs->blog_desc,
+                         'url'     => $rs_blogs->blog_url,
+                         'creadt'  => $rs_blogs->blog_creadt,
+                         'upddt'   => $rs_blogs->blog_upddt
+                    );
+               }
+          }
+          
+          # Switch blog form
+          $form = new dcForm($this->core,'switchblog_menu','index.php');
+          $form
+               ->addField(
+                    new dcFieldCombo('switchblog',$this->core->blog->id,$blogs,array(
+                    'label' => __('Blogs:'))))
+               ->addField(
+                    new dcFieldSubmit('switchblog_submit',__('ok'),array(
+                    'action' => 'switchblog')))
+               ->setup();
+     }
+     
+     /**
+      * Get current blog information
+      */
+     protected function getCurrentBlog()
+     {
+          $this->protected_globals['current_blog'] = $this->core->auth->blog_count ?
+               array(
+                    'id'      => $this->core->blog->id,
+                    'name'    => $this->core->blog->name,
+                    'desc'    => $this->core->blog->desc,
+                    'url'     => $this->core->blog->url,
+                    'host'    => $this->core->blog->host,
+                    'creadt'  => $this->core->blog->creadt,
+                    'upddt'   => $this->core->blog->upddt
+               ) : array(
+                    'id'      => '',
+                    'name'    => '',
+                    'desc'    => '',
+                    'url'     => '',
+                    'host'    => '',
+                    'creadt'  => '',
+                    'upddt'   => ''
+               );
+     }
+     
+     /**
+      * Get current user information
+      */
+     protected function getCurrentUser()
+     {
+          $this->protected_globals['current_user'] = $this->core->auth->userID() ?
+               array(
+                    'id'      => $this->core->auth->userID(),
+                    'admin'   => $this->core->auth->getInfo('user_admin'),
+                    'name'    => $this->core->auth->getInfo('user_name'),
+                    'firstname'    => $this->core->auth->getInfo('user_firstname'),
+                    'displayname'  => $this->core->auth->getInfo('user_displayname'),
+                    'url'     => $this->core->auth->getInfo('user_url'),
+                    'blog'    => $this->core->auth->getInfo('user_default_blog'),
+                    'lang'    => $this->core->auth->getInfo('user_lang'),
+                    'tz'      => $this->core->auth->getInfo('user_tz'),
+                    'creadt'  => $this->core->auth->getInfo('user_creadt'),
+                    'cn'      => $this->core->auth->getInfo('user_cn')
+               ) :
+               array(
+                    'id'      => '',
+                    'admin'   => '',
+                    'name'    => '',
+                    'firstname'    => '',
+                    'displayname'  => '',
+                    'url'     => '',
+                    'blog'    => '',
+                    'lang'    => 'en',
+                    'tz'      => '',
+                    'creadt'  => '',
+                    'cn'      => '',
+               );
+     }
 }
 ?>

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

@@ -1 +1 @@
 {% import "js_helpers.html.twig" as js %}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{{current_user.lang}}" lang="{{current_user.lang}}">
 <head>
      {% block header %}
      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-     <title>{% block title %}{{page_title}} - {% if blog.name is not empty %}{{blog.name}} - {% endif %}{{vendor_name}} - {{version}}{% endblock %}</title>
+     <title>{% block title %}{{page_title}} - {% 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" />
@@ -18 +18 @@
 </head>
 
-
 <body id="dotclear-admin">
      <div id="header">
@@ -28 +27 @@
           <div id="info-boxes">
                <div id="info-box1">
-                    <form action="index.php" method="post">
-                         Blog : <strong title="http://localhost/dc23/index.php?">Mon premier blog</strong>
-                         <a href="http://localhost/dc23/index.php?" onclick="window.open(this.href);return false;" 
-                         title="{{ __('Go to site') }} ({{__('new window')}})">{{__('Go to site')}}<img src="images/outgoing.png" alt="" /></a>
-                    </form>
+                 {% form switchblog_menu %}
+                    {% if blog_count > 1 and blog_count < 20 %}
+                         {{ form_field('switchblog') }}
+                         <noscript><div>{{ form_field('switchblog_submit') }}</div></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 %}
+                    <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>
+                 {% endform %}
                </div>
                <div id="info-box2">
-                    <a class="active" href="index.php">{{__('My dashboard')}}</a><span> | </span>
-                    <a href="preferences.php">{{__('My preferences')}}</a><span> | </span>
-                    <a href="index.php?logout=1" class="logout">Déconnecter dsls <img src="images/logout.png" alt="" /></a>
+                    <a {%if current_page == 'index' %}class="active" {% endif %}href="index.php">{{__('My dashboard')}}</a><span> | </span>
+                    <a {%if current_page == 'preferences' %}class="active" {% endif %}href="preferences.php">{{__('My preferences')}}</a><span> | </span>
+                    <a href="index.php?logout=1" class="logout">{{__('Logout %s')|format(current_user.id)}} <img src="images/logout.png" alt="" /></a>
                </div>
           </div>
@@ -45 +49 @@
                <div id="content">
                     {% block content %}
-                    <h2>{{blog.name}} &rsaquo; <span class="page-title">{{page_title}}</span></h2>
+                    <h2>{{current_blog.name}} &rsaquo; <span class="page-title">{{page_title}}</span></h2>
                     {% if page_message is not empty %}
                          <p class="message">{{page_message}}</p>

inc/admin/default-templates/style/default.css

@@ -150 +150 @@
 #info-box1 select {
      width: 15em;
+}
+#info-box1 label {
+     margin-right: .3em;
+     display: inline;
 }
 #info-box1 a img, #info-box2 a img {