Merge pull request #1 from andrewebdev/master

Pages now look better in Grappelli

Author: mmcnickle

pages/static/pages/css/pages.css

@@ -373,7 +373,7 @@ html[dir=rtl] .change-list .insert {
 .change-list .language-cell {
     width: 1%;
     white-space: nowrap;
-    padding: 5px 0 5px 10px;
+    /*padding: 10px 0 10px 10px;*/
 }
 .change-list .language-cell ul {
     margin: 0;
@@ -406,7 +406,7 @@ html[dir=rtl] .change-list .insert {
 .change-list .publish-cell {
     width: 1%;
     white-space: nowrap;
-    padding: 0 20px 0 10px;
+    /*padding: 0 20px 0 10px;*/
 }
 .change-list .publish-cell .box {
     width: 130px;
@@ -418,6 +418,7 @@ html[dir=rtl] .change-list .insert {
 .change-list .publish-cell img {
     width: 10px;
     height: 10px;
+    vertical-align: text-bottom;
 }
 .change-list .publish-cell .publish-select {
     margin: 2px;
@@ -428,14 +429,14 @@ html[dir=rtl] .change-list .insert {
 .change-list .template-cell {
     width: 1%;
     white-space: nowrap;
-    padding: 5px 10px;
+    /*padding: 5px 10px;*/
 }
 
 /* autor */
 .change-list .author-cell {
     width: 1%;
     white-space: nowrap;
-    padding: 5px 10px;
+    /*padding: 5px 10px;*/
 }
 
 /* change-form page =========================================== */
@@ -448,6 +449,7 @@ html[dir=rtl] .change-list .insert {
     display: inline; /* IE6 fix */
     margin-right: 1em;
 }
+
 html[dir=rtl] .change-form .sidebar {
     float:right;
     margin-left:1em;
@@ -463,6 +465,12 @@ html[dir=rtl] .change-form .sidebar {
     width: 148px;
 }
 
+.change-form .sidebar .form-row {
+    padding: 0 10px;
+}
+.change-form .sidebar fieldset {
+    padding-bottom: 1em;
+}
 .change-form .sidebar p.help,
 .change-form .sidebar .form-row p.help {
     margin-left: 0;

pages/templates/admin/pages/page/change_form.html

@@ -11,13 +11,6 @@
 {% block content %}
 <!-- Content -->
 <div id="content-main">
-    {% block object-tools %}
-        {% if change and not is_popup %}
-            <ul class="object-tools">
-                {% if has_absolute_url %}<li><a href="{% show_absolute_url page %}" class="viewsitelink">{% trans "View on site" %}</a></li>{% endif %}
-            </ul>
-        {% endif %}
-    {% endblock %}
 
     <form id="page_form" {% if has_file_field %}enctype="multipart/form-data" {% endif %} action="?language={{ request.GET.language }}{%if request.GET.target %}&amp;target={{ request.GET.target }}{% endif %}&amp;{%if request.GET.target %}position={{ request.GET.position }}{% endif %}" method="post">
         {% csrf_token %}

pages/templates/admin/pages/page/change_list.html

@@ -5,13 +5,6 @@
 
 {% block bodyclass %}change-list{% endblock %}
 
-{% if not is_popup %}{% block breadcrumbs %}
-    <div class="breadcrumbs">
-    <a href="../../">{% trans "Home" %}</a> &rsaquo; 
-    <a href="../">{{ app_label|capfirst|escape }}</a> &rsaquo; {{ opts.verbose_name_plural|capfirst|escape }}
-    </div>
-{% endblock %}{% endif %}
-
 {% block coltype %}flex{% endblock %}
 
 {% block extrahead %}{{ block.super }}
@@ -25,37 +18,14 @@
 <script type="text/javascript" src="{{ PAGES_MEDIA_URL }}javascript/pages_list.js"></script>
 {% endblock %}
 
-{% block content %}
-<div id="content-main">
-
-{% if has_add_permission %}
-<ul class="object-tools"><li><a href="add/" class="addlink">{% blocktrans with name as name %}Add {{ name }}{% endblocktrans %}</a></li></ul>
-{% endif %}
-
-<div class="module" id="changelist">
 
 {% block result_list %}
-<form method="post" action="">
-{% csrf_token %}
-{% if action_form and actions_on_top and cl.full_result_count %}{% admin_actions %}{% endif %}
-
-<div id="toolbar">
-<form id="changelist-search" action="" method="post">
-    <div>
-        <label for="searchbar"><img src="{% load adminmedia %}{% admin_media_prefix %}img/admin/icon_searchbox.png" alt="{% trans "Search" %}" /></label>
-        <input type="text" size="25" name="q" value="{{q}}" id="searchbar" />
-        <input type="submit" name="g" value="{% trans "Go" %}" />
-    </div>
-</form>
-</div>
-
-<div id="page-list">
-{% include "admin/pages/page/change_list_table.html" %}
-</div>
-{% if action_form and actions_on_bottom and cl.full_result_count %}{% admin_actions %}{% endif %}
-</form>
-{% endblock %}
+    <form method="post" action="">{% csrf_token %}
+
+        <div id="page-list" class="module changelist-results">
+            {% include "admin/pages/page/change_list_table.html" %}
+        </div>
 
-</div>
-</div>
+        {% if action_form and actions_on_bottom and cl.full_result_count %}{% admin_actions %}{% endif %}
+    </form>
 {% endblock %}

pages/templates/admin/pages/page/menu.html

@@ -1,6 +1,6 @@
 {% load pages_tags i18n adminmedia cache %}
 
-<tr id="page-row-{{ page.id }}" class="child-of-{{ page.parent_id }} draggable">
+<tr id="page-row-{{ page.id }}" class="child-of-{{ page.parent_id }} draggable {% cycle 'row1' 'row2' %}">
     <td class="selection-cell"><input class="action-select" type="checkbox" name="_selected_action" value="{{ page.id }}"/></td>
     <th class="title-cell">
         <div class="title-cell-container" style="margin-{{ LANGUAGE_BIDI|yesno:"right,left" }}:{{ page.margin_level }}em">