Merge branch 'master' of github.com:beetletweezers/tweezers
commit
bd586cbb18
|
@ -131,15 +131,15 @@ label { display: block; margin-bottom: 4px; font-weight: bold; }
|
|||
#project_bar a { text-decoration: none; }
|
||||
|
||||
/* editing dashboard toolbar */
|
||||
#project_bar .project-title { float: left; font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; font-weight: bold; padding: 5px 0 0 0; }
|
||||
#project_bar .project-title { font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; font-weight: bold; padding: 0 0 20px 0; }
|
||||
#project_bar .project-title h2 { font-size: 24px; }
|
||||
|
||||
/* editing options */
|
||||
#project_bar .editing-options ul { float: right; }
|
||||
#project_bar .editing-options ul li { float: left; display: block; margin-left: 10px; }
|
||||
#project_bar .editing-options ul li.active a { background-color: #465158; }
|
||||
#project_bar .editing-options a { display: block; padding: 6px 10px 4px; font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; font-weight: bold; font-size: 14px; height: 18px; line-height: 18px; text-decoration: none; color: #fff; background: #8CA1AF; -moz-border-radius: 3px; -webkit-border-radius: 3px; }
|
||||
#project_bar .editing-options a:hover { background-color: #465158; }
|
||||
/* options */
|
||||
#project_bar .options ul { }
|
||||
#project_bar .options ul li { float: left; display: block; margin-right: 10px; }
|
||||
#project_bar .options ul li.active a { background-color: #465158; }
|
||||
#project_bar .options a { display: block; padding: 6px 10px 4px; font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; font-weight: bold; font-size: 14px; height: 18px; line-height: 18px; text-decoration: none; color: #fff; background: #8CA1AF url(../images/gradient-light.png) bottom left repeat-x; -moz-border-radius: 3px; -webkit-border-radius: 3px; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.3); }
|
||||
#project_bar .options a:hover { background-color: #465158; }
|
||||
|
||||
/* text editor */
|
||||
.editor { width: 500px; height: 600px; }
|
||||
|
@ -150,6 +150,11 @@ label { display: block; margin-bottom: 4px; font-weight: bold; }
|
|||
li.depth-3 { padding-left: 40px; }
|
||||
li.depth-4 { padding-left: 60px; }
|
||||
li.depth-5 { padding-left: 80px; }
|
||||
li.depth-6 { padding-left: 100px; }
|
||||
li.depth-7 { padding-left: 120px; }
|
||||
li.depth-8 { padding-left: 140px; }
|
||||
li.depth-9 { padding-left: 160px; }
|
||||
li.depth-10 { padding-left: 180px; }
|
||||
|
||||
|
||||
/* pagination */
|
||||
|
@ -172,7 +177,7 @@ label { display: block; margin-bottom: 4px; font-weight: bold; }
|
|||
|
||||
/* call out */
|
||||
|
||||
.call-out { display: block; float: right; padding: 6px 10px 4px; font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; font-weight: bold; font-size: 14px; height: 18px; line-height: 18px; text-decoration: none; color: #fff; background: #8CA1AF; -moz-border-radius: 3px; -webkit-border-radius: 3px; }
|
||||
.call-out { display: block; float: right; padding: 6px 10px 4px; font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; font-weight: bold; font-size: 14px; height: 18px; line-height: 18px; text-decoration: none; color: #fff; background: #8CA1AF url(../images/gradient-light.png) bottom left repeat-x; -moz-border-radius: 3px; -webkit-border-radius: 3px; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.3); }
|
||||
.call-out:hover { color: #fff; background-color: #465158; }
|
||||
|
||||
|
||||
|
@ -190,6 +195,7 @@ label { display: block; margin-bottom: 4px; font-weight: bold; }
|
|||
.left { float: left; }
|
||||
.right { float: right; }
|
||||
.quiet { color: #999; }
|
||||
.help_text { color: #999; }
|
||||
.first { margin-left: 0; padding-left: 0; }
|
||||
.last { margin-right: 0; padding-right: 0; }
|
||||
.top { margin-top: 0; padding-top: 0; }
|
||||
|
|
|
@ -3,23 +3,5 @@
|
|||
{% block nav-dashboard %} class="active"{% endblock %}
|
||||
|
||||
{% block project_editing %}
|
||||
<!-- BEGIN project bar -->
|
||||
<div id="project_bar">
|
||||
<div class="wrapper">
|
||||
|
||||
<div class="project-title">
|
||||
<h2>{{ project }}</h2>
|
||||
</div>
|
||||
|
||||
<div class="editing-options">
|
||||
<ul>
|
||||
<li {% block editing-option-manage %}{% endblock %}><a href="{% url projects_manage project.slug %}">Manage Files</a></li>
|
||||
<li {% block editing-option-conf %}{% endblock %}><a href="{% url projects_configure project.slug %}">Edit Conf</a></li>
|
||||
<li {% block editing-option-view %}{% endblock %}><a href="{{ project.get_docs_url }}">View Docs</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<!-- END project bar -->
|
||||
{% include "core/project_bar.html" %}
|
||||
{% endblock %}
|
||||
|
|
|
@ -7,6 +7,9 @@
|
|||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<p class="help_text">
|
||||
If you've got a project on a public repository, you can add the docs to Read the Docs via our <a class="" href="{% url projects_import %}">import tool</a>.
|
||||
</p>
|
||||
<form method="post" action=".">{% csrf_token %}
|
||||
{{ form.as_p }}
|
||||
<p><input type="submit" value="Create" /></p>
|
||||
|
|
|
@ -3,24 +3,7 @@
|
|||
{% block title %}{{ project.name }}{% endblock %}
|
||||
|
||||
{% block project_editing %}
|
||||
<!-- BEGIN project bar -->
|
||||
<div id="project_bar">
|
||||
<div class="wrapper">
|
||||
|
||||
<div class="project-title">
|
||||
<h2>{{ project }}</h2>
|
||||
<a href="{% url projects_user_list project.user.username %}" class="quiet">({{ project.user }})</a>
|
||||
<span class="quiet">{% if project.version %}version {{ project.version }} -{% endif %} {{ project.modified_date|date:"j F, Y" }}</span>
|
||||
</div>
|
||||
|
||||
<div class="editing-options">
|
||||
<ul>
|
||||
<li {% block editing-option-view %}{% endblock %}><a href="{{ project.get_docs_url }}">View Docs</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- END project bar -->
|
||||
{% include "core/project_bar.html" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
|
|
@ -0,0 +1,25 @@
|
|||
|
||||
<!-- BEGIN project bar -->
|
||||
<div id="project_bar">
|
||||
<div class="wrapper">
|
||||
|
||||
<div class="project-title">
|
||||
<h2>{{ project }}</h2>
|
||||
<a href="{% url projects_user_list project.user.username %}" class="quiet">({{ project.user }})</a>
|
||||
<span class="quiet">{% if project.version %}version {{ project.version }} -{% endif %} {{ project.modified_date|date:"j F, Y" }}</span>
|
||||
</div>
|
||||
|
||||
<div class="options">
|
||||
<ul>
|
||||
{% if request.user == project.user %}
|
||||
<li {% block editing-option-manage %}{% endblock %}><a href="{% url projects_manage project.slug %}">Manage Files</a></li>
|
||||
<li {% block editing-option-conf %}{% endblock %}><a href="{% url projects_configure project.slug %}">Edit Conf</a></li>
|
||||
{% endif %}
|
||||
<li {% block editing-option-builds %}{% endblock %}><a href="{% url builds_list %}">Builds</a></li>
|
||||
<li {% block editing-option-view %}{% endblock %}><a href="{{ project.get_docs_url }}">View Docs</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<!-- END project bar -->
|
|
@ -31,9 +31,7 @@
|
|||
|
||||
<div class="module-list">
|
||||
<ul>
|
||||
{% for project in project_list %}
|
||||
<li class="module-item"><a href="{{ project.get_absolute_url }}">{{ project.name }}</a></li>
|
||||
{% endfor %}
|
||||
{% include "core/project_list_detailed.html" %}
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
@ -53,7 +51,7 @@
|
|||
<div class="module-list">
|
||||
<ul>
|
||||
{% for pageview in updated_list %}
|
||||
<li class="module-item"><a href="{% url docs_detail pageview.project.user.username pageview.project.slug pageview.url %}">{{ pageview.project.name }} - {{ pageview.url }}</a></li>
|
||||
<li class="module-item col-span"><a href="{% url docs_detail pageview.project.user.username pageview.project.slug pageview.url %}">{{ pageview.project.name }} - {{ pageview.url }}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
|
|
Loading…
Reference in New Issue