Changeset 1319:32528cac0405 for inc/admin

Timestamp:

08/09/13 15:19:11 (12 years ago)

Author:

Dsls

Branch:

twig

Message:

Continuing with twig -> post.php

Location:

inc/admin

Files:

• class.dc.admincontext.php (modified) (1 diff)
• class.dc.form.php (modified) (1 diff)
• default-templates/forms/form_layout.html.twig (modified) (1 diff)
• default-templates/layout.html.twig (modified) (1 diff)
• default-templates/post.html.twig (modified) (2 diffs)

inc/admin/class.dc.admincontext.php

@@ -429 +429 @@
                     'label' => __('Search:'))))
                ->addField(
-                    new dcFieldSubmit('ok',__('OK'),array(
+                    new dcFieldSubmit(array('ok'),__('OK'),array(
                     )))
                ->setup();

inc/admin/class.dc.form.php

@@ -926 +926 @@
                $attr['value'] = $this->getDefaultValue();
           }
-          if ($offset==0) {
+          if ($offset==0 && !empty($this->id)) {
                $attr['id']=$this->id;
           }

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

@@ -57 +57 @@
 {% block field_attr %}
 {% spaceless %}
- 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 %}
+ {% if id %}id="{{id}}"{% endif %} 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 %}

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

@@ -10 +10 @@
      <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" />
+     <link rel="icon" type="image/png" href="images/favicon.png" />
      {% if rtl is not empty %}
      <link rel="stylesheet" href="{{theme_url}}style/default-rtl.css" type="text/css" media="screen" />

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

@@ -24 +24 @@
                <p class="area" id="content-area">{{ form_field('post_content',{'rows':current_user.options.edit_size,'cols':5}) }}</p>
                <p class="area" id="notes-area">{{ form_field('post_notes',{'rows':5,'cols':50}) }}</p>
-               <p>{{ form_field('save')}} {{form_field('delete',{'class':'delete'})}}</p>
+               <p>{{ form_field('save')}} 
+               {% if preview_url is defined %}
+                    <a id="post-preview" href="{{ preview_url}}" class="button" accesskey="p">{{__('Preview')}} (p)</a>
+               {% endif %}
+               
+               {{form_field('delete',{'class':'delete'})}}</p>
+
           </div>
      </div>
@@ -36 +42 @@
      <p>{{ form_field('post_open_tb')}}</p>
      <p>{{ form_field('post_selected')}}</p>
-     <p>{{ form_field('post_lang')}}</p>
+     <p>{{ form_field('post_lang',{"class":"maximal"},{'nestedlabel':true})}}</p>
+     <p>{{ form_field('post_password',{"size":10, "class":"maximal"},{'nestedlabel':true})}}</p>
+     <div class="lockable">
+          <p>{{ form_field('post_url',{"size":10, "class":"maximal"})}} </p>
+          <p class="form-note warn">
+          {{ __('Warning: If you set the URL manually, it may conflict with another entry.') }}
+          </p>
+     </div>
 </div>
 {% endform %}
 </div>
+{% if post_id is defined %}
+<p><a href="trackbacks.php?id={{ post_id }}" class="multi-part">{{__('Ping blogs')}}</a></p>
+<div class="multi-part" id="comments" title="{{__('Comments')}}">
+<!-- to be completed -->
+</div>
+<div class="multi-part" id="add-comment" title="{{__('Add a comment')}}">
+<h3>{{__('Add a comment')}}</h3>
+{% form 'add-comment' %}
+<div class="constrained">
+     <p>{{ form_field('comment_author',{'size': 30}) }}</p>
+     <p>{{ form_field('comment_email',{'size': 30})}}</p>
+     <p>{{ form_field('comment_site',{'size': 30})}}</p>
+     <p class="area">{{ form_field('comment_content',{'cols': 50,'rows':8})}}</p>
+     <p>{{ form_field('add') }}</p>
+</div>
+
+{% endform %}
+</div>
+
+{% endif %}
 {% endblock %}