Просмотр исходного кода

Correctly use the *-view classes

sh4nks 9 лет назад
Родитель
Сommit
2e5ba5f574

+ 2 - 4
flaskbb/themes/aurora/src/flaskbb.scss

@@ -163,11 +163,8 @@ body {
 }
 
 
-// right now it doesn't matter which one you use
+// they don't have a purpose at the moment.. but this might change
 .index-view, .forum-view, .topic-view, .page-view {
-    .forum-row, .category-row, .post-row, .page-row {
-        margin: 0;
-    }
 }
 
 
@@ -192,6 +189,7 @@ body {
         border-bottom: 1px solid $panel-meta-border;
     }
     .category-row, .forum-row, .topic-row, .page-row, .post-row {
+        margin: 0;
         padding-top: 0.5em;
         padding-bottom: 0.5em;
         &:not(:last-child) {

+ 22 - 22
flaskbb/themes/aurora/templates/forum/memberlist.html

@@ -4,33 +4,33 @@
 {% block content %}
 {% from theme('macros.html') import render_pagination, group_field %}
 
-<ol class="breadcrumb flaskbb-breadcrumb">
-    <li><a href="{{ url_for('forum.index') }}">{% trans %}Forum{% endtrans %}</a></li>
-    <li class="active">{% trans %}Memberlist{% endtrans %}</li>
-</ol>
+<div class="page-view">
+    <ol class="breadcrumb flaskbb-breadcrumb">
+        <li><a href="{{ url_for('forum.index') }}">{% trans %}Forum{% endtrans %}</a></li>
+        <li class="active">{% trans %}Memberlist{% endtrans %}</li>
+    </ol>
 
-<div class="row controls-row">
-    <div class="col-md-8 col-sm-8 col-xs-8 controls-col">
-        <div class="pull-left">
-            {{ render_pagination(users, url_for('forum.memberlist')) }}
+    <div class="row controls-row">
+        <div class="col-md-8 col-sm-8 col-xs-8 controls-col">
+            <div class="pull-left">
+                {{ render_pagination(users, url_for('forum.memberlist')) }}
+            </div>
         </div>
-    </div>
-    <div class="col-md-4 col-sm-4 col-xs-4 controls-col">
-        <div class="pull-right">
-          <form class="inline-form" role="form" method="post">
-              <div class="input-group">
-                  {{ search_form.hidden_tag() }}
-                  {{ group_field(search_form.search_query) }}
-                  <span class="input-group-btn">
-                    <button class="btn btn-primary" type="submit">{% trans %}Search{% endtrans %}</button>
-                  </span>
-              </div>
-          </form>
+        <div class="col-md-4 col-sm-4 col-xs-4 controls-col">
+            <div class="pull-right">
+              <form class="inline-form" role="form" method="post">
+                  <div class="input-group">
+                      {{ search_form.hidden_tag() }}
+                      {{ group_field(search_form.search_query) }}
+                      <span class="input-group-btn">
+                        <button class="btn btn-primary" type="submit">{% trans %}Search{% endtrans %}</button>
+                      </span>
+                  </div>
+              </form>
+            </div>
         </div>
     </div>
-</div>
 
-<div class="page-view">
     <div class="panel panel-default page-panel">
         <div class="panel-heading page-head">
             <a href="{{ url_for('forum.memberlist') }}">{% trans %}Memberlist{% endtrans %}</a>

+ 7 - 7
flaskbb/themes/aurora/templates/forum/new_post.html

@@ -10,14 +10,14 @@
 {% block content %}
 {% from theme("macros.html") import render_quickreply, render_submit_field %}
 
-<ol class="breadcrumb flaskbb-breadcrumb">
-    <li><a href="{{ url_for('forum.index') }}">{% trans %}Forum{% endtrans %}</a></li>
-    <li><a href="{{ topic.forum.url }}">{{ topic.forum.title }}</a></li>
-    <li><a href="{{ topic.url }}">{{ topic.title }} </a></li>
-    <li class="active">{% trans %}New Post{% endtrans %}</li>
-</ol>
-
 <div class="page-view">
+    <ol class="breadcrumb flaskbb-breadcrumb">
+        <li><a href="{{ url_for('forum.index') }}">{% trans %}Forum{% endtrans %}</a></li>
+        <li><a href="{{ topic.forum.url }}">{{ topic.forum.title }}</a></li>
+        <li><a href="{{ topic.url }}">{{ topic.title }} </a></li>
+        <li class="active">{% trans %}New Post{% endtrans %}</li>
+    </ol>
+
     <form class="form-horizontal" role="form" method="post">
         {{ form.hidden_tag() }}
         <div class="panel panel-default page-panel">

+ 7 - 6
flaskbb/themes/aurora/templates/forum/new_topic.html

@@ -10,13 +10,14 @@
 {% block content %}
 {% from theme("macros.html") import render_field, render_submit_field, render_quickreply %}
 
-<ol class="breadcrumb flaskbb-breadcrumb">
-    <li><a href="{{ url_for('forum.index') }}">{% trans %}Forum{% endtrans %}</a></li>
-    <li><a href="{{ forum.url }}">{{ forum.title }}</a></li>
-    <li class="active">{% trans %}New Topic{% endtrans %}</li>
-</ol>
-
 <div class="page-view">
+    <ol class="breadcrumb flaskbb-breadcrumb">
+        <li><a href="{{ url_for('forum.index') }}">{% trans %}Forum{% endtrans %}</a></li>
+        <li><a href="{{ forum.url }}">{{ forum.title }}</a></li>
+        <li class="active">{% trans %}New Topic{% endtrans %}</li>
+    </ol>
+
+
     <form class="form-horizontal" role="form" method="post">
         {{ form.hidden_tag() }}
         <div class="panel panel-default page-panel">

+ 5 - 5
flaskbb/themes/aurora/templates/forum/search_form.html

@@ -4,12 +4,12 @@
 {% block content %}
 {% from theme("macros.html") import horizontal_field %}
 
-<ol class="breadcrumb flaskbb-breadcrumb">
-    <li><a href="{{ url_for('forum.index') }}">{% trans %}Forum{% endtrans %}</a></li>
-    <li class="active">{% trans %}Search{% endtrans %}</li>
-</ol>
-
 <div class="page-view">
+    <ol class="breadcrumb flaskbb-breadcrumb">
+        <li><a href="{{ url_for('forum.index') }}">{% trans %}Forum{% endtrans %}</a></li>
+        <li class="active">{% trans %}Search{% endtrans %}</li>
+    </ol>
+
     <div class="panel panel-default page-panel">
         <div class="panel-heading page-head">
             {% trans %}Search{% endtrans %}

+ 4 - 5
flaskbb/themes/aurora/templates/forum/search_result.html

@@ -4,12 +4,11 @@
 {% block content %}
 {% from theme('macros.html') import render_pagination, group_field, topic_pages %}
 
-<ol class="breadcrumb flaskbb-breadcrumb">
-    <li><a href="{{ url_for('forum.index') }}">{% trans %}Forum{% endtrans %}</a></li>
-    <li class="active">{% trans %}Search{% endtrans %}</li>
-</ol>
-
 <div class="page-view">
+    <ol class="breadcrumb flaskbb-breadcrumb">
+        <li><a href="{{ url_for('forum.index') }}">{% trans %}Forum{% endtrans %}</a></li>
+        <li class="active">{% trans %}Search{% endtrans %}</li>
+    </ol>
 
     {% if result['post'] %}
     <div class="panel panel-default topic-panel">

+ 7 - 7
flaskbb/themes/aurora/templates/forum/topic.html

@@ -9,14 +9,14 @@
 {% block content %}
 {% from theme('macros.html') import render_pagination, form_field, generate_post_id, generate_post_url %}
 
-<ol class="breadcrumb flaskbb-breadcrumb">
-    <li><a href="{{ url_for('forum.index') }}">{% trans %}Forum{% endtrans %}</a></li>
-    <li><a href="{{ topic.forum.category.url }}">{{ topic.forum.category.title }}</a></li>
-    <li><a href="{{ topic.forum.url }}">{{ topic.forum.title }}</a></li>
-    <li class="active">{{ topic.title }}</li>
-</ol>
-
 <div class="topic-view">
+    <ol class="breadcrumb flaskbb-breadcrumb">
+        <li><a href="{{ url_for('forum.index') }}">{% trans %}Forum{% endtrans %}</a></li>
+        <li><a href="{{ topic.forum.category.url }}">{{ topic.forum.category.title }}</a></li>
+        <li><a href="{{ topic.forum.url }}">{{ topic.forum.title }}</a></li>
+        <li class="active">{{ topic.title }}</li>
+    </ol>
+
     {% include theme('forum/topic_controls.html') %}
 
     <div class="panel panel-default topic-panel">

+ 6 - 5
flaskbb/themes/aurora/templates/forum/topictracker.html

@@ -8,12 +8,13 @@
 <form class="form" role="form" method="POST">
     <div style="display:none;"><input id="csrf_token" name="csrf_token" type="hidden" value="{{ csrf_token() }}"></div>
 
-    <ol class="breadcrumb flaskbb-breadcrumb">
-        <li><a href="{{ url_for('forum.index') }}">{% trans %}Forum{% endtrans %}</a></li>
-        <li class="active">{% trans %}Topic Tracker{% endtrans %}</li>
-    </ol>
-
     <div class="forum-view">
+
+        <ol class="breadcrumb flaskbb-breadcrumb">
+            <li><a href="{{ url_for('forum.index') }}">{% trans %}Forum{% endtrans %}</a></li>
+            <li class="active">{% trans %}Topic Tracker{% endtrans %}</li>
+        </ol>
+
         <div class="row controls-row">
             <div class="pull-left">
                 {{ render_pagination(topics, url_for('forum.topictracker')) }}