Changeset 1316:751f3031bcc7

Timestamp:

08/09/13 11:14:13 (11 years ago)

Author:

Dsls

Branch:

twig

Message:

Manual merge for remaining little things from default, need to cope with this 3px difference in search box...
Btw, fixes checkboxes problems

Location:

inc/admin

Files:

• class.dc.admincontext.php (modified) (1 diff)
• default-templates/auth.html.twig (modified) (2 diffs)
• default-templates/forms/form_layout.html.twig (modified) (3 diffs)
• default-templates/layout.html.twig (modified) (6 diffs)
• lib.dc.page.php (modified) (1 diff)
• prepend.php (modified) (1 diff)

inc/admin/class.dc.admincontext.php

@@ -421 +421 @@
                     'action' => 'switchblog')))
                ->setup();
+          # Switch blog form
+          $sform = new dcForm($this->core,'search-menu','search.php','GET');
+          $sform
+               ->addField(
+                    new dcFieldText('q','',array(
+                    'maxlength'         => 255,
+                    'label' => __('Search:'))))
+               ->addField(
+                    new dcFieldSubmit('ok',__('OK'),array(
+                    )))
+               ->setup();
      }
      

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

@@ -9 +9 @@
   <meta name="ROBOTS" content="NOARCHIVE,NOINDEX,NOFOLLOW" />
   <meta name="GOOGLEBOT" content="NOSNIPPET" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>{{vendor_name}}</title>
   <link rel="stylesheet" href="{{theme_url}}style/default.css" type="text/css" media="screen" />
@@ -63 +64 @@
                <p>{{ form_field('user_id') }}</p>
                <p>{{ form_field('user_pwd') }}</p>
-               <p>{{ form_field('user_remenber') }}</p>
-               <p>{{ form_field('auth_login')}}</p>
+               <p>{{ form_field('user_remenber',{},{'nestedlabel':true, 'labelclass':'classic'}) }}</p>
+               <p>{{ form_field('auth_login',{"class":"add button"}) }}</p>
      {% if safe_mode %}
           </fieldset>

inc/admin/default-templates/forms/form_layout.html.twig

@@ -51 +51 @@
 {% set nestedlabel = true %}
 {% set labelclass = "classic" %}
+{% set descafter = true %}
     {{ block('field_input') }}
-{#{% spaceless %}
-
-     {% if label is not empty %}
-          <label for="{{name}}" class="classic">
-     {% endif %}
-    <input type="checkbox" {{ block('field_attr') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %} />
-     {% if label is not empty %}
-          {{ label }}</label>
-     {% endif %}
-{% endspaceless %}#}
 {% endblock field_checkbox %}
 
 {% block field_attr %}
 {% spaceless %}
- id="{{id}}" name="{{name}}" {% if read_only %} disabled="disabled"{% endif %}{% if required %} required="required"{% endif %}{% if max_length %} maxlength="{{ max_length }}"{% endif %}{% if pattern %} pattern="{{ pattern }}"{% endif %}
+ id="{{id}}" name="{{name}}" {% if read_only %} disabled="disabled"{% endif %}{% if required %} required="required"{% endif %}{% if maxlength %} maxlength="{{ maxlength }}"{% endif %}{% if pattern %} pattern="{{ pattern }}"{% endif %}
     {% for attrname,attrvalue in attr %}{{attrname}}="{{attrvalue}}" {% endfor %}
 {% endspaceless %}
@@ -112 +103 @@
             {% set labelclass = labelclass ~ " required" %}
         {% endif %}
-        <label for="{{name}}" {% if labelclass is not empty %}class="{{labelclass}}"{% endif %} {% if required is not empty %}<abbr title="{{__('Required field')}}">*</abbr>{% else %}>{% endif %} {{label}}
+        <label for="{{name}}" {% if labelclass is not empty %}class="{{labelclass}}"{% endif %}>{% if required is not empty %}<abbr title="{{__('Required field')}}">*</abbr>{% endif %} 
+
+          {% if descafter is empty %} {{label}} {% endif %}
         {% if nestedlabel is empty %}</label> {% endif %}
     {% endif %}
@@ -121 +114 @@
 {% spaceless %}
     {% if label is not empty %}
+          {% if descafter %} {{label}} {% endif %}
         {% if nestedlabel is not empty %}</label>{% endif %}
     {% endif %}

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

@@ -8 +8 @@
      <meta name="ROBOTS" content="NOARCHIVE,NOINDEX,NOFOLLOW" />
      <meta name="GOOGLEBOT" content="NOSNIPPET" />
+     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
      <link rel="stylesheet" href="{{theme_url}}style/default.css" type="text/css" media="screen" />
      {% if rtl is not empty %}
@@ -29 +30 @@
                <div id="info-box1">
                  {% form 'switchblog_menu' %}
+                    
                     {% if blog_count > 1 and blog_count < 20 %}
-                         {{ form_field('switchblog',{},{'nestedlabel' : true, labelclass:'classic'}) }}
+                         {{ form_field('switchblog',{},{'labelclass':'classic nomobile'}) }}
                          <noscript>{{ form_field('switchblog_submit') }}</noscript>
                     {% else %}
@@ -36 +38 @@
                          {% 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>
+                    <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></p>
                  {% endform %}
                </div>
                <div id="info-box2">
-                    <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 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>
@@ -96 +98 @@
           <div id="main-menu">
                {% block menus %}
+               {% form 'search-menu' with {'id':'search-menu'} %}
+                    <p> {{ form_field('q',{'size':30},{'labelclass':'hidden'}) }} 
+                         {{ form_field('ok') }}
+                    </p>
+               {% endform %}
                {% for menu in menus %}
                {% if menu.items is not empty %}
@@ -122 +129 @@
           </div>
      </div>
-     {% block debug %}
+     {#{% block debug %}
        {% set debug_info = debug_info() %}
        {% if debug_info is not empty %}
@@ -138 +145 @@
           </div></div>
        {% endif %}
-     {% endblock %}
+     {% endblock %}#}
      </body>
 </html>

inc/admin/lib.dc.page.php

@@ -188 +188 @@
           
           self::jsVar('dotclear.msg.help',
-               __('help')).
+               __('Help about this page')).
+          self::jsVar('dotclear.msg.help_hide',
+               __('Hide')).
           self::jsVar('dotclear.msg.no_selection',
                __('no selection')).

inc/admin/prepend.php

@@ -284 +284 @@
      # Set menu titles
      
-     $_menu['System']->title = __('System');
+     $_menu['System']->title = __('System settings');
      $_menu['Blog']->title = __('Blog');
-     $_menu['Plugins']->title = __('Plugins');
+     $_menu['Plugins']->title = __('Additional plugins');
      if (!$user_ui_nofavmenu)
           $_menu['Favorites']->title = __('My favorites');