changeset 2496:7ca681527b6c

HTML generated is now validated, some errors remain with index view
author sharky93 <rishabhr123@gmail.com>
date Fri, 20 Sep 2013 19:26:37 +0530
parents b0e5881e515e
children 058645813612
files MoinMoin/themes/basic/static/css/basic.css MoinMoin/themes/basic/static/custom-less/basic.less MoinMoin/themes/basic/templates/history.html MoinMoin/themes/basic/templates/layout.html MoinMoin/themes/basic/templates/snippets.html MoinMoin/themes/basic/templates/usersettings_forms.html
diffstat 6 files changed, 44 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/themes/basic/static/css/basic.css	Tue Sep 17 21:55:55 2013 +0530
+++ b/MoinMoin/themes/basic/static/css/basic.css	Fri Sep 20 19:26:37 2013 +0530
@@ -4378,6 +4378,9 @@
 .moin-breadcrumb > .active {
   color: #999999;
 }
+.moin-breadcrumb > li + li:before {
+  content: "\0020";
+}
 .moin-nav {
   margin-bottom: 0;
   padding-left: 0;
--- a/MoinMoin/themes/basic/static/custom-less/basic.less	Tue Sep 17 21:55:55 2013 +0530
+++ b/MoinMoin/themes/basic/static/custom-less/basic.less	Fri Sep 20 19:26:37 2013 +0530
@@ -87,6 +87,11 @@
 
 .moin-breadcrumb {
   .breadcrumb;
+  > li {
+    &+li:before {
+      content: "\0020"; // Unicode space which is non-collapsing
+    }
+  }
 }
 
 .moin-nav {
--- a/MoinMoin/themes/basic/templates/history.html	Tue Sep 17 21:55:55 2013 +0530
+++ b/MoinMoin/themes/basic/templates/history.html	Fri Sep 20 19:26:37 2013 +0530
@@ -38,7 +38,7 @@
                 {% for doc in history %}
                 <tr>
                     <td>{{ doc.name|join(' | ') }}</td>
-                    <td title="{{ _("Size") }}: {{ doc.size }} &#013;{{ doc.contenttype|shorten_ctype }}: {{ doc.contenttype }}" >
+                    <td title="{{ _("Size") }}: {{ doc.size }} &#10;{{ doc.contenttype|shorten_ctype }}: {{ doc.contenttype }}" >
                         {{ doc.revid | shorten_id }}
                     </td>
                     <td>{{ doc.mtime|datetimeformat }}</td>
@@ -90,7 +90,10 @@
                         </a> 
                     </li>
                     {%- endif %}
-                </tr>
+                </ul>
+                </div>
+            </td>
+            </tr>
                 {% endfor %}
             </tbody>
             {% if bookmark_time %}
--- a/MoinMoin/themes/basic/templates/layout.html	Tue Sep 17 21:55:55 2013 +0530
+++ b/MoinMoin/themes/basic/templates/layout.html	Fri Sep 20 19:26:37 2013 +0530
@@ -51,7 +51,7 @@
             <div class="col-lg-2 moin-logo">
                 {% if logo %}
                 <a href="{{ url_for('frontend.show_item', item_name=cfg.item_root) }}">
-                    <img class="img-circle" src="{{ '/static/logos/moinmoin.png' }}"/>
+                    <img class="img-circle" src="{{ '/static/logos/moinmoin.png' }}" alt="Site Logo"/>
                 </a>
                 {% endif %}
             </div>
@@ -143,14 +143,15 @@
                                        class="{% if err %}moin-badinterwiki{% else %}moin-interwiki{% endif %}">
                                        {{ item_name|shorten_item_name }}
                                     </a>
+                                    <i class="icon-double-angle-right icon-fixed-width"></i>
                                 {%- else -%}
                                     <a href="{{ url_for('frontend.show_item', item_name=item_name) }}"{{ " " }}
                                        {% if not exists -%}class="moin-nonexistent"{%- endif -%}>
                                        {{ item_name|shorten_item_name }}
                                     </a>
+                                    <i class="icon-double-angle-right icon-fixed-width"></i>
                                 {%- endif %}
                               </li>
-                              <i class="icon-double-angle-right icon-fixed-width"></i>
                             {% endif %}
                             {% endfor %}
                         {% endif %}
@@ -277,8 +278,8 @@
         <div class="row">
             <div class="col-lg-12">
                 <div class="navbar"> <!--footer-->
+                    {{ footer_logos }}
                     {{ credits }}
-                    {{ footer_logos }}
                 </div>
             </div>
         </div> <!--/row for footer-->
--- a/MoinMoin/themes/basic/templates/snippets.html	Tue Sep 17 21:55:55 2013 +0530
+++ b/MoinMoin/themes/basic/templates/snippets.html	Fri Sep 20 19:26:37 2013 +0530
@@ -26,7 +26,7 @@
 
 
 {# Text links in the footer #}
-{% macro credits(start='<div class="nav navbar-nav pull-right"> <li>'|safe, end='</li> </div>'|safe, sep='</li> <li>'|safe) %}
+{% macro credits(start='<ul class="nav navbar-nav pull-right"> <li>'|safe, end='</li> </ul>'|safe, sep='</li> <li>'|safe) %}
 {{ start }}
 {{ credit('http://moinmo.in/', 'MoinMoin Powered', 'This site uses the MoinMoin Wiki software.') }}
 {{ sep }}
--- a/MoinMoin/themes/basic/templates/usersettings_forms.html	Tue Sep 17 21:55:55 2013 +0530
+++ b/MoinMoin/themes/basic/templates/usersettings_forms.html	Fri Sep 20 19:26:37 2013 +0530
@@ -19,14 +19,18 @@
         'locale',
         ] %}
         <div class="form-group">
-            <dt>
-            {{ gen.label(form[e]) }}
-            </dt>
-            {{ gen.select.open(form[e], class="btn") }}
-            {% for value, label in form[e].properties['choice_specs'] %}
-              {{ gen.option(form[e], value=value, contents=label or value) }}
-            {% endfor %}
-            {{ gen.select.close() }}
+            <dl>
+                <dt>
+                    {{ gen.label(form[e]) }}
+                </dt>
+                <dd>
+                    {{ gen.select.open(form[e], class="btn") }}
+                    {% for value, label in form[e].properties['choice_specs'] %}
+                      {{ gen.option(form[e], value=value, contents=label or value) }}
+                    {% endfor %}
+                    {{ gen.select.close() }}
+                </dd>
+            </dl>
         </div>
     {% endfor %}
 {{ forms.render_hidden('part', 'personal') }}
@@ -46,9 +50,7 @@
         'password2',
         ] %}
         <div class="form-group">
-            <dt>
-                {{ gen.label(form[e]) }}
-            </dt>
+            {{ gen.label(form[e]) }}
             {{ gen.input(form[e], type="password", class="form-control") }}
         </div>
     {% endfor %}
@@ -66,9 +68,7 @@
 {% endif %}
 {{ forms.render_errors(form) }}
 <div class="form-group">
-    <dt>
-        {{ gen.label(form['email']) }}
-    </dt>
+    {{ gen.label(form['email']) }}
     <div class="input-group">
         {{ gen.input(form['email'], type="email", class="form-control") }}
         <span class="input-group-addon"><i class="icon-envelope"></i></span>
@@ -85,14 +85,18 @@
 {{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
 {{ forms.render_errors(form) }}
     <div class="form-group">
-        <dt>
-        {{ gen.label(form['theme_name']) }}
-        </dt>
-        {{ gen.select.open(form['theme_name'], class="btn") }}
-        {% for value, label in form['theme_name'].properties['choice_specs'] %}
-          {{ gen.option(form['theme_name'], value=value, contents=label or value) }}
-        {% endfor %}
-        {{ gen.select.close() }}
+        <dl>
+            <dt>
+                {{ gen.label(form['theme_name']) }}
+            </dt>
+            <dd>
+                {{ gen.select.open(form['theme_name'], class="btn") }}
+                {% for value, label in form['theme_name'].properties['choice_specs'] %}
+                  {{ gen.option(form['theme_name'], value=value, contents=label or value) }}
+                {% endfor %}
+                {{ gen.select.close() }}
+            </dd>
+        </dl>
     </div>
     {% for e in [
         'css_url',