Lots of template rejiggering.

Things properly highlight now when they are selected in the UI. This also standardized the UI of the Admin page and the project detail page.
2012-12-06 19:39:31 -08:00 · 2012-12-06 19:39:31 -08:00 · 3c29b29a79
parent bc6597953d
commit 3c29b29a79
21 changed files with 161 additions and 140 deletions
--- a/readthedocs/templates/base.html
+++ b/readthedocs/templates/base.html
@ -19,11 +19,11 @@
  <!-- jquery -->
  <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
  <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/jquery-ui.min.js"></script>
-  
+
  <script type="text/javascript" src="{{ MEDIA_URL }}javascript/instantsearch.js"></script>
-  
+
  {% block extra_scripts %}{% endblock %}
-  
+
  <!-- typekit -->
  <!-- Old typekit
  <script type="text/javascript" src="//use.typekit.com/xgl8ypn.js"></script>
@ -32,12 +32,14 @@

  <script type="text/javascript" src="//use.typekit.net/haq4xtp.js"></script>
  <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
-  
+
 </head>

 <body class="{% block body_class %}{% endblock %}">

-    {% block header-wrapper %}{% include "core/header.html" %}{% endblock %}
+    {% block header-wrapper %}
+        {% include "core/header.html" %}
+    {% endblock %}

    {% block dashboard_bar %}{% endblock %}

--- a/readthedocs/templates/builds/build_detail.html
+++ b/readthedocs/templates/builds/build_detail.html
@ -1,9 +1,16 @@
-{% extends "projects/base_project_editing.html" %}
+{% extends "projects/base_project.html" %}

 {% load i18n %}

 {% block title %}{{ build.project.name }}{% endblock %}

+
+{% block project_editing %}
+    {% with builds_active="active" %}
+        {% include "core/project_bar.html" %}
+    {% endwith %}
+{% endblock %}
+
 {% block content-header %}<h1>{% blocktrans with build.project.name as project_name %}Build for {{ project_name }}{% endblocktrans %}</h1>{% endblock %}

 {% block content %}
--- a/readthedocs/templates/builds/build_list.html
+++ b/readthedocs/templates/builds/build_list.html
@ -1,4 +1,4 @@
-{% extends "projects/base_project_editing.html" %}
+{% extends "projects/base_project.html" %}

 {% load i18n %}

@ -6,6 +6,12 @@

 {% block title %}Builds{% endblock %}

+{% block project_editing %}
+    {% with builds_active="active" %}
+        {% include "core/project_bar.html" %}
+    {% endwith %}
+{% endblock %}
+
 {% block content %}
 <div id="build_list">

--- a/readthedocs/templates/core/header.html
+++ b/readthedocs/templates/core/header.html
@ -89,7 +89,7 @@
        <div class="rtfd-header-nav">
          <ul>
            {% if request.user.is_authenticated %}
-              <li {% block nav-dashboard %}{% endblock %}><a href="{% url projects_dashboard %}">{% trans "Dashboard" %}</a></li>
+              <li class="{{ dashboard_active }}"><a href="{% url projects_dashboard %}">{% trans "Dashboard" %}</a></li>
              <li><a href="{% url auth_logout %}">{% trans "Log Out" %}</a></li>
            {% else %}
              <li><a href="{% url auth_login %}">{% trans "Log in" %}</a></li>
--- a/readthedocs/templates/core/project_bar.html
+++ b/readthedocs/templates/core/project_bar.html
@ -27,28 +27,32 @@
          {% endif %}

          <ul>
+              <li class="{{ overview_active }}"><a href="{{ project.get_absolute_url }}">{% trans "Overview" %}</a></li>
            {% if project.has_good_build %}
-              <li {% block editing-option-view %}{% endblock %}><a href="{{ project.get_docs_url }}">{% trans "View Docs" %}</a></li>
+              <li><a href="{{ project.get_docs_url }}">{% trans "View Docs" %}</a></li>
            {% endif %}

-              <li><a href="{% url project_downloads project.slug %}" rel="nofollow,noindex">Downloads</a></li>
-
-            {% if request.user in project.users.all %}
-              {% if not project.is_imported %}
-                <li {% block editing-option-manage %}{% endblock %}><a href="{% url projects_manage project.slug %}">{% trans "Manage Files" %}</a></li>
-              {% endif %}
-              <li {% block editing-option-edit-proj %}{% endblock %}><a href="{% url projects_edit project.slug %}">{% trans "Edit" %} </a></li>
-              <li><a href="{% url projects_subprojects project.slug %}">{% trans "Subprojects" %}</a></li>
-            {% endif %}
+            <li class="{{ downloads_active }}"><a href="{% url project_downloads project.slug %}" rel="nofollow,noindex">Downloads</a></li>

            {% if project.get_latest_build %}
-              <li {% block editing-option-builds %}{% endblock %}><a href="{{ project.get_builds_url }}">{% trans "Builds" %}</a></li>
+              <li class="{{ builds_active }}"><a href="{{ project.get_builds_url }}">{% trans "Builds" %}</a></li>
            {% endif %}

+            <li>&nbsp;&nbsp;</li>
+
            {% if project.has_versions and request.user in project.users.all %}
-              <li><a href="{% url projects_versions project.slug %}" rel="nofollow,noindex">{% trans "Versions" %}</a></li>
+              <li class="{{ versions_active }}"><a href="{% url projects_versions project.slug %}" rel="nofollow,noindex">{% trans "Versions" %}</a></li>
            {% endif %}

+            {% if request.user in project.users.all %}
+              <li class="{{ subprojects_active }}"><a href="{% url projects_subprojects project.slug %}">{% trans "Subprojects" %}</a></li>
+            {% endif %}
+
+            {% if request.user in project.users.all %}
+              <li class="{{ edit_active }}"><a href="{% url projects_edit project.slug %}">{% trans "Edit" %} </a></li>
+            {% endif %}
+
+
          </ul>
        </div>

--- a/readthedocs/templates/dashboard/base_dashboard.html
+++ b/readthedocs/templates/dashboard/base_dashboard.html
@ -1,44 +1,7 @@
 {% extends "base.html" %}

-{% load i18n %}
-
 {% block dashboard_bar %}

-    <!-- BEGIN dashboard bar -->
-    <div id="dashboard_bar">
-      <div class="wrapper">
-
-          <ul>
-            <li class="first last {% block dash-nav-projects %}{% endblock %}"><a href="{% url projects_dashboard %}">{% trans "Projects" %}</a></li>
-            {% comment %}
-            <li class="{% block dash-nav-bookmarks %}{% endblock %}"><a href="{% url user_bookmarks %}">{% trans "Bookmarks" %}</a></li>
-            {% endcomment %}
-          </ul>
-
-          <ul>
-            <li class="first last {% block dash-nav-import %}{% endblock %}"><a href="{% url projects_import %}">{% trans "Import" %}</a></li>
-          </ul>
-
-          <ul>
-            {% if request.user.get_profile %}
-              <li class="first">
-                <a href="{{ request.user.get_profile.get_absolute_url }}">{% trans "View Profile" %}</a>
-              </li>
-              <li class="{% block dash-nav-profile %}{% endblock %}">
-                <a href="{% url profiles_profile_edit %}">{% trans "Edit Profile" %}</a>
-              </li>
-            {% else %}
-              <li>
-                <a href="{% url profiles_profile_create %}">{% trans "Create Profile" %}</a>
-              </li>
-            {% endif %}
-            <li class="last {% block dash-nav-change-pw %}{% endblock %}">
-              <a href="/accounts/password/change/">{% trans "Change Password" %}</a>
-            </li>
-          </ul>
-
-      </div>
-    </div>
-    <!-- END dashboard bar -->
+  {% include "dashboard/dashboard_bar.html" %}

 {% endblock %}
--- a/readthedocs/templates/dashboard/dashboard_bar.html
+++ b/readthedocs/templates/dashboard/dashboard_bar.html
@ -0,0 +1,38 @@
+{% load i18n %}
+
+    <!-- BEGIN dashboard bar -->
+    <div id="dashboard_bar">
+      <div class="wrapper">
+
+          <ul>
+            <li class="first last {{ projects_active }}"><a href="{% url projects_dashboard %}">{% trans "Projects" %}</a></li>
+            {% comment %}
+            <li class="{% block dash-nav-bookmarks %}{% endblock %}"><a href="{% url user_bookmarks %}">{% trans "Bookmarks" %}</a></li>
+            {% endcomment %}
+          </ul>
+
+          <ul>
+            <li class="first last {{ import_active }}"><a href="{% url projects_import %}">{% trans "Import" %}</a></li>
+          </ul>
+
+          <ul>
+            {% if request.user.get_profile %}
+              <li class="first {{ view_profile_active }}">
+                <a href="{{ request.user.get_profile.get_absolute_url }}">{% trans "View Profile" %}</a>
+              </li>
+              <li class="{{ edit_profile_active }}">
+                <a href="{% url profiles_profile_edit %}">{% trans "Edit Profile" %}</a>
+              </li>
+            {% else %}
+              <li>
+                <a href="{{ profiles_profile_create }}">{% trans "Create Profile" %}</a>
+              </li>
+            {% endif %}
+            <li class="last {{ change_password_active }}">
+              <a href="/accounts/password/change/">{% trans "Change Password" %}</a>
+            </li>
+          </ul>
+
+      </div>
+    </div>
+    <!-- END dashboard bar -->
--- a/readthedocs/templates/profiles/edit_profile.html
+++ b/readthedocs/templates/profiles/edit_profile.html
@ -1,10 +1,15 @@
-{% extends "profiles/base_profile.html" %}
+{% extends "base.html" %}

 {% load i18n %}

 {% block title %}{% trans "Edit your profile" %}{% endblock %}

-{% block dash-nav-profile %}active{% endblock %}
+
+{% block dashboard_bar %}
+  {% with edit_profile_active="active" %}
+    {% include "dashboard/dashboard_bar.html" %}
+  {% endwith %}
+{% endblock %}

 {% block content-header %}
  <h1>{% trans "Edit your profile" %}</h1>
@ -16,4 +21,3 @@
    <input type="submit" name="submit" value="{% trans "OK, save it!" %}" id="submit"/>
  </form>
 {% endblock %}
-
--- a/readthedocs/templates/profiles/profile_detail.html
+++ b/readthedocs/templates/profiles/profile_detail.html
@ -8,6 +8,16 @@
  <h1>{% blocktrans with profile.user as user %}{{ user }}'s profile{% endblocktrans %}</h1>
 {% endblock %}

+
+{% block dashboard_bar %}
+    {% if request.user == profile.user %}
+        {% with view_profile_active="active" %}
+            {% include "dashboard/dashboard_bar.html" %}
+        {% endwith %}
+    {% endif %}
+{% endblock %}
+
+
 {% block content %}
  {% if profile.homepage %}
  <h3>{% trans "Homepage" %}</h3>
--- a/readthedocs/templates/projects/base_project_editing.html
+++ b/readthedocs/templates/projects/base_project_editing.html
@ -1,8 +0,0 @@
-{% extends "projects/base_project.html" %}
-
-{% block nav-dashboard %} class="active"{% endblock %}
-
-{% block project_editing %}
-      {% include "core/project_bar.html" %}
-{% endblock %}
-
--- a/readthedocs/templates/projects/project_configure.html
+++ b/readthedocs/templates/projects/project_configure.html
@ -1,15 +0,0 @@
-{% extends "projects/base_project_editing.html" %}
-{% load i18n %}
-
-{% block title %}{% blocktrans with project.name as name %}Configure {{ name }}{% endblocktrans %}{% endblock %}
-
-{% block content-header %}<h1>{% trans "Edit Configuration" %}</h1>{% endblock %}
-
-{% block editing-option-conf %}class="active"{% endblock %}
-
-{% block content %}
-  <form method="post" action=".">{% csrf_token %}
-    {{ form.as_p }}
-    <p><input type="submit" value="{% trans "Save Configuration" %}" /></p>
-  </form>
-{% endblock %}
--- a/readthedocs/templates/projects/project_create.html
+++ b/readthedocs/templates/projects/project_create.html
@ -8,6 +8,14 @@

 {% block dash-nav-create %}active{% endblock %}

+{% block dashboard_bar %}
+  {% with dash_nav_create="active" %}
+    {% include "dashboard/dashboard_bar.html" %}
+  {% endwith %}
+{% endblock %}
+
+
+
 {% block extra_scripts %}
  <script type="text/javascript" src="{{ MEDIA_URL }}lib/markitup/jquery.markitup.pack.js"></script>
  <script type="text/javascript" src="{{ MEDIA_URL }}lib/markitup/sets/sphinx/editor.js"></script>
--- a/readthedocs/templates/projects/project_dashboard.html
+++ b/readthedocs/templates/projects/project_dashboard.html
@ -1,10 +1,14 @@
-{% extends "dashboard/base_dashboard.html" %}
+{% extends "base.html" %}
 {% load i18n %}
 {% load pagination_tags %}

 {% block title %}{% trans "Project Dashboard" %}{% endblock %}

-{% block nav-dashboard %}class="active"{% endblock %}
+{% block dashboard_bar %}
+  {% with projects_active="active" %}
+    {% include "dashboard/dashboard_bar.html" %}
+  {% endwith %}
+{% endblock %}

 {% block dash-nav-projects %}active{% endblock %}

@ -61,21 +65,13 @@
                      <li class="module-item col-span">
                        <a href="{% url projects_manage project.slug %}">{{ project.name }}</a>
                        <ul class="module-item-menu">
-                          {% if not project.is_imported %}
-                            <li><a href="{% url projects_manage project.slug %}">{% trans "Manage Files" %}</a></li>
-                          {% endif %}
-                          {% if project.has_versions %}
-                            <li><a href="{% url projects_versions project.slug %}" rel="nofollow,noindex">{% trans "Versions" %}</a></li>
-                        {% endif %}
+                          <li><a href="{% url projects_versions project.slug %}" rel="nofollow,noindex">{% trans "Versions" %}</a></li>
+                          <li><a href="{% url projects_subprojects project.slug %}">{% trans "Subprojects" %}</a></li>
+                          <li><a href="{% url projects_edit project.slug %}">{% trans "Edit" %}</a></li>
                          {% if project.has_aliases %}
                            <li><a href="{% url projects_alias_list project.slug %}" rel="nofollow,noindex">{% trans "Aliases" %}</a></li>
-                        {% endif %}
-
-                          {% if project.subprojects.count %}
-                          <li><a href="{% url projects_subprojects project.slug %}">{% trans "Subprojects" %}</a></li>
                          {% endif %}
-                          <li><a href="{% url projects_edit project.slug %}">{% trans "Edit" %}</a></li>
-                          <li><a href="{{ project.get_builds_url }}">{% trans "Builds" %}</a></li>
+                          <li>&nbsp;&nbsp;</li>
                          <li><a href="{{ project.get_docs_url }}">{% trans "View Docs" %}</a></li>
                        </ul>
                      </li>
--- a/readthedocs/templates/projects/project_detail.html
+++ b/readthedocs/templates/projects/project_detail.html
@ -5,7 +5,9 @@
 {% block title %}{{ project.name }}{% endblock %}

 {% block project_editing %}
-  {% include "core/project_bar.html" %}
+    {% with overview_active="active" %}
+        {% include "core/project_bar.html" %}
+    {% endwith %}
 {% endblock %}

 {% block content %}
--- a/readthedocs/templates/projects/project_downloads.html
+++ b/readthedocs/templates/projects/project_downloads.html
@ -5,9 +5,13 @@
 {% block title %}{{ project.name }}{% endblock %}

 {% block project_editing %}
-  {% include "core/project_bar.html" %}
+    {% with downloads_active="active" %}
+        {% include "core/project_bar.html" %}
+    {% endwith %}
 {% endblock %}

+{% block downloads-view %}active{% endblock %}
+
 {% block content %}

          <!-- BEGIN builds list -->
--- a/readthedocs/templates/projects/project_edit.html
+++ b/readthedocs/templates/projects/project_edit.html
@ -1,6 +1,15 @@
-{% extends "projects/base_project_editing.html" %}
+{% extends "projects/base_project.html" %}
 {% load i18n %}

+{% block nav-dashboard %} class="active"{% endblock %}
+
+{% block project_editing %}
+    {% with edit_active="active" %}
+        {% include "core/project_bar.html" %}
+    {% endwith %}
+{% endblock %}
+
+
 {% block extra_links %}
  <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}lib/markitup/skins/simple/style.css" />
  <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}lib/markitup/sets/sphinx/editor.css" />
@ -19,6 +28,7 @@
 {% block title %}{% trans "Edit Project" %}{% endblock %}

 {% block editing-option-edit-proj %}class="active"{% endblock %}
+{% block editing-option-view %}active{% endblock %}

 {% block content-header %}<h1>{% trans "Edit Project" %}</h1>{% endblock %}

--- a/readthedocs/templates/projects/project_import.html
+++ b/readthedocs/templates/projects/project_import.html
@ -1,4 +1,4 @@
-{% extends "dashboard/base_dashboard.html" %}
+{% extends "base.html" %}
 {% load i18n %}

 {% block title %}{% trans "Import an existing project" %}{% endblock %}
@ -7,7 +7,11 @@
 <script type="text/javascript" src="{{ MEDIA_URL }}javascript/rtd-import.js"></script>
 {% endblock %}

-{% block dash-nav-import %}active{% endblock %}
+{% block dashboard_bar %}
+  {% with import_active="active" %}
+    {% include "dashboard/dashboard_bar.html" %}
+  {% endwith %}
+{% endblock %}

 {% block content-header %}<h1>{% trans "Import an existing project" %}</h1>{% endblock %}

--- a/readthedocs/templates/projects/project_manage.html
+++ b/readthedocs/templates/projects/project_manage.html
@ -1,33 +0,0 @@
-{% extends "projects/base_project_editing.html" %}
-{% load i18n %}
-
-{% load projects_tags %}
-
-{% block title %}{% trans "Manage" %} {{ project.name }}{% endblock %}
-
-{% block content-header %}
-{% if not project.is_imported %}
-<h1>{% trans "Project Files" %}</h1>
-{% endif %}
-{% endblock %}
-
-{% block editing-option-manage %} class="active"{% endblock %}
-
-{% block content %}
-
-  {% if not project.is_imported %}
-  <a class="call-out" href="{% url projects_file_add project.slug %}">{% trans "Add New File" %}</a>
-
-  <ul>
-    {% for file in project.get_top_level_files|annotated_tree %}
-      <li class="depth-{{ file.depth }}">
-        <a href="{% url projects_file_edit project.slug file.id %}">{{ file.heading }}</a>
-        <a class="quiet" href="{% url projects_file_delete project.slug file.id %}">{% trans "(delete)" %}</a>
-      </li>
-    {% endfor %}
-  </ul>
-  {% else %}
-      {% include "core/project_details.html" %}
-  {% endif %}
-
-{% endblock %}
--- a/readthedocs/templates/projects/project_subprojects.html
+++ b/readthedocs/templates/projects/project_subprojects.html
@ -1,9 +1,17 @@
-{% extends "projects/base_project_editing.html" %}
+{% extends "projects/base_project.html" %}

 {% load i18n %}

 {% block title %}{% trans "Edit Subprojects" %}{% endblock %}

+{% block nav-dashboard %} class="active"{% endblock %}
+
+{% block project_editing %}
+    {% with subprojects_active="active" %}
+        {% include "core/project_bar.html" %}
+    {% endwith %}
+{% endblock %}
+
 {% block editing-option-edit-proj %}class="active"{% endblock %}

 {% block content-header %}<h1>{% trans "Edit Subprojects" %}</h1>{% endblock %}
--- a/readthedocs/templates/projects/project_versions.html
+++ b/readthedocs/templates/projects/project_versions.html
@ -1,4 +1,4 @@
-{% extends "projects/base_project_editing.html" %}
+{% extends "projects/base_project.html" %}
 {% load i18n %}

 {% block title %}{% trans "Edit Project Versions" %}{% endblock %}
@ -7,6 +7,13 @@

 {% block content-header %}<h1>{% trans "Edit Project Versions" %}</h1>{% endblock %}

+
+{% block project_editing %}
+    {% with versions_active="active" %}
+        {% include "core/project_bar.html" %}
+    {% endwith %}
+{% endblock %}
+
 {% block content %}
  <p class="help_text">
    {% trans "If you are having trouble building older versions of your Documentation, then you can" %} <a href="{% url projects_upload_html project.slug %}">{% trans "Upload a Zip file of HTML" %}</a> {% trans "instead. This is to support versions that may not build anymore with current Sphinx, or to support plugins and extensions that we may not have on our server." %}
--- a/readthedocs/templates/registration/password_change_form.html
+++ b/readthedocs/templates/registration/password_change_form.html
@ -1,9 +1,13 @@
-{% extends "dashboard/base_dashboard.html" %}
+{% extends "base.html" %}
 {% load i18n %}

 {% block title %}{% trans 'Password change' %}{% endblock %}

-{% block dash-nav-change-pw %}active{% endblock %}
+{% block dashboard_bar %}
+  {% with change_password_active="active" %}
+    {% include "dashboard/dashboard_bar.html" %}
+  {% endwith %}
+{% endblock %}

 {% block content %}<div id="content-main">