use project_edit_base for administrative project pages
parent
d9201bd647
commit
5512de8ed2
|
@ -269,7 +269,7 @@ p.build-missing { font-size: .8em; color: #9d9a55; margin: 0 0 3px; }
|
|||
/* sidebar + main content */
|
||||
|
||||
.navigable { width: 100%; overflow: hidden; }
|
||||
.navigable > ul { width:192px; margin-right:16px; float: left; overflow:hidden; }
|
||||
.navigable > ul { width:184px; margin-right:16px; float: left; overflow:hidden; }
|
||||
.navigable > ul > li { border-bottom: 1px solid #bfbfbf; position:relative; }
|
||||
.navigable > ul > li > * { padding-left:8px; padding-bottom:4px; padding-top:5px; text-decoration: none; display: block; }
|
||||
.navigable > ul > li:last-child { border-bottom: none; }
|
||||
|
@ -277,7 +277,7 @@ p.build-missing { font-size: .8em; color: #9d9a55; margin: 0 0 3px; }
|
|||
.navigable > ul > li.active:after { content:"•"; position:absolute; right:8px; top:6px; font-size:1.2em; color:#465158; }
|
||||
|
||||
.navigable > ul > li:hover { background:#E8ECEF; }
|
||||
.navigable > div { width:592px; float: left; }
|
||||
.navigable > div { width:600px; float: left; padding-top:4px; }
|
||||
|
||||
/* autocomplete */
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
text-decoration:none;
|
||||
}
|
||||
.markItUp {
|
||||
width:700px;
|
||||
width:500px;
|
||||
margin:5px 0 5px 0;
|
||||
}
|
||||
.markItUpContainer {
|
||||
|
@ -21,7 +21,7 @@
|
|||
.markItUpEditor {
|
||||
font:12px 'Courier New', Courier, monospace;
|
||||
padding:5px;
|
||||
width:690px;
|
||||
width:490px;
|
||||
height:320px;
|
||||
clear:both; display:block;
|
||||
line-height:18px;
|
||||
|
|
|
@ -41,19 +41,7 @@
|
|||
<li> </li>
|
||||
|
||||
{% if request.user in project.users.all %}
|
||||
<li><a href="{% url projects_users project.slug %}">{% trans "Admins" %}</a></li>
|
||||
{% endif %}
|
||||
|
||||
{% if project.has_versions and request.user in project.users.all %}
|
||||
<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>
|
||||
<li class="{{ edit_active }}"><a href="{% url projects_edit project.slug %}">{% trans "Edit" %} </a></li>
|
||||
{% endif %}
|
||||
|
||||
|
||||
|
|
|
@ -1,15 +1,9 @@
|
|||
{% extends "projects/base_project.html" %}
|
||||
{% extends "projects/project_edit_base.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block project-edit-active %}active{% endblock %}
|
||||
{% 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" />
|
||||
|
@ -30,9 +24,9 @@
|
|||
{% block editing-option-edit-proj %}class="active"{% endblock %}
|
||||
{% block editing-option-view %}active{% endblock %}
|
||||
|
||||
{% block content-header %}<h1>{% trans "Edit Project" %}</h1>{% endblock %}
|
||||
{% block project_edit_content_header %}{% trans "Edit Project" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{% block project_edit_content %}
|
||||
<form method="post" action=".">{% csrf_token %}
|
||||
{{ form.as_p }}
|
||||
<p>
|
||||
|
|
|
@ -0,0 +1,27 @@
|
|||
{% extends "projects/base_project.html" %}
|
||||
|
||||
{% block project_editing %}
|
||||
{% with edit_active="active" %}
|
||||
{% include "core/project_bar.html" %}
|
||||
{% endwith %}
|
||||
{% endblock %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block content %}
|
||||
<div class="navigable">
|
||||
<ul>
|
||||
<li class="{% block project-edit-active %}{% endblock %}"><a href="{% url projects_edit project.slug %}">{% trans "Settings" %} </a></li>
|
||||
<li class="{% block project-admins-active %}{% endblock %}"><a href="{% url projects_users project.slug %}">{% trans "Admins" %}</a></li>
|
||||
{% if project.has_versions %}
|
||||
<li class="{% block project-versions-active %}{% endblock %}"><a href="{% url projects_versions project.slug %}" rel="nofollow,noindex">{% trans "Versions" %}</a></li>
|
||||
{% endif %}
|
||||
<li class="{% block project-subprojects-active %}{% endblock %}"><a href="{% url projects_subprojects project.slug %}">{% trans "Subprojects" %}</a></li>
|
||||
</ul>
|
||||
<div>
|
||||
<h2>{% block project_edit_content_header %}{% endblock %}</h2>
|
||||
{% block project_edit_content %}
|
||||
|
||||
{% endblock %}
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "projects/base_project.html" %}
|
||||
{% extends "projects/project_edit_base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
|
@ -6,17 +6,12 @@
|
|||
|
||||
{% 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 %}
|
||||
{% block project-subprojects-active %}active{% endblock %}
|
||||
{% block project_edit_content_header %}{% trans "Edit Subprojects" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{% block project_edit_content %}
|
||||
<p class="help_text">
|
||||
{% trans "This allows you to add subprojects to your project. This allows them to live in the same namespace in the URLConf for a subdomain or CNAME." %}
|
||||
</p>
|
||||
|
|
|
@ -1,18 +1,13 @@
|
|||
{% extends "projects/base_project.html" %}
|
||||
{% extends "projects/project_edit_base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
{% block title %}{% trans "Edit Admins" %}{% endblock %}
|
||||
|
||||
{% block project_editing %}
|
||||
{% with users_active="active" %}
|
||||
{% include "core/project_bar.html" %}
|
||||
{% endwith %}
|
||||
{% endblock %}
|
||||
{% block project-admins-active %}active{% endblock %}
|
||||
{% block project_edit_content_header %}{% trans "Edit Admins" %}{% endblock %}
|
||||
|
||||
{% block content-header %}<h1>{% trans "Edit Admins" %}</h1>{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{% block project_edit_content %}
|
||||
<p class="help_text">
|
||||
{% trans "This allows you to add users to your project. It gives them admin access to the project, so be careful!" %}
|
||||
</p>
|
||||
|
|
|
@ -1,20 +1,14 @@
|
|||
{% extends "projects/base_project.html" %}
|
||||
{% extends "projects/project_edit_base.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block title %}{% trans "Edit Project Versions" %}{% endblock %}
|
||||
|
||||
{% block project-versions-active %}active{% endblock %}
|
||||
{% block editing-option-edit-proj %}class="active"{% endblock %}
|
||||
|
||||
{% block content-header %}<h1>{% trans "Edit Project Versions" %}</h1>{% endblock %}
|
||||
{% block project_edit_content_header %}{% trans "Edit Project Versions" %}{% endblock %}
|
||||
|
||||
|
||||
{% block project_editing %}
|
||||
{% with versions_active="active" %}
|
||||
{% include "core/project_bar.html" %}
|
||||
{% endwith %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{% block project_edit_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." %}
|
||||
</p>
|
||||
|
|
Loading…
Reference in New Issue