EbookFoundation
/
readthedocs.org
mirror of https://github.com/EbookFoundation/readthedocs.org.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:rtfd/readthedocs.org

rtd2
Bobby Grace 2010-08-19 00:12:28 -05:00
parent eed65f7d64 2f1298fd92
commit 2d55c96104
6 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
media/css/core.css
View File

@ -164,6 +164,10 @@ label { display: block; margin-bottom: 4px; font-weight: bold; color: #444; }
li.depth-8 { padding-left: 140px; }
li.depth-9 { padding-left: 160px; }
li.depth-10 { padding-left: 180px; }
p.build-success { font-size: .8em; color: #080; }
p.build-failure { font-size: .8em; color: #D00; }
p.build-missing { font-size: .8em; color: #aa5; }
/* pagination */

1
projects/tasks.py
View File

@ -55,6 +55,7 @@ def update_imported_docs(project):
if os.path.exists(os.path.join(path, project.slug)):
os.chdir(project.slug)
if project.repo_type == 'hg':
run('hg pull')
run('hg update -C -r . ')
elif project.repo_type == 'git':
run('git --git-dir=.git fetch')

22
templates/core/project_bar.html
View File

@ -12,19 +12,29 @@
<div class="options">
<ul>
{% if request.user == project.user %}
{% if not project.is_imported %}
<li {% block editing-option-manage %}{% endblock %}><a href="{% url projects_manage project.slug %}">Manage Files</a></li>
{% endif %}
<li {% block editing-option-edit-proj %}{% endblock %}><a href="{% url projects_edit project.slug %}">Edit Project</a></li>
{% if not project.is_imported %}
<li {% block editing-option-manage %}{% endblock %}><a href="{% url projects_manage project.slug %}">Manage Files</a></li>
{% endif %}
<li {% block editing-option-edit-proj %}{% endblock %}><a href="{% url projects_edit project.slug %}">Edit Project</a></li>
{% endif %}
<li {% block editing-option-builds %}{% endblock %}><a href="{% url builds_project_list project.user.username project.slug %}">Builds</a></li>
<li {% block editing-option-view %}{% endblock %}><a href="{{ project.get_docs_url }}">View Docs</a></li>
{% if project.get_latest_build.success %}
<li {% block editing-option-view %}{% endblock %}><a href="{{ project.get_docs_url }}">View Docs</a></li>
{% endif %}
{% if project.project_url %}
<li><a href="{{ project.project_url }}" rel="nofollow,noindex">Project Homepage</a></li>
<li><a href="{{ project.project_url }}" rel="nofollow,noindex">Project Homepage</a></li>
{% endif %}
</ul>
</div>
{% if project.get_latest_build %}
{% if not project.get_latest_build.success %}
<p class="build-failure">Build failed (<a href="{% url builds_project_list project.user.username project.slug %}">why</a>)</p>
{% endif %}
{% else %}
<p class="build-missing">We currently have no builds for this project!{% if request.user == project.user %} <a href="{% url projects_edit project.slug %}">Is the repo correct?</a>{% endif %}</p>
{% endif %}
</div>
</div>

28
templates/core/project_list_detailed.html
View File

@ -1,14 +1,18 @@
{% for project in project_list %}
<li class="module-item">
<a class="module-item-title" href="{{ project.get_absolute_url }}">{{ project.name }}</a>
<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:"N j, Y. P" }}</span>
<ul class="module-item-menu">
<li><a href="{% url docs_detail project.user.username project.slug "index.html" %}">View Docs</a></li>
</ul>
</li>
{% empty %}
<li class="module-item quiet">No projects found</li>
{% endfor %}
{% for project in project_list %}
<li class="module-item">
<a class="module-item-title" href="{{ project.get_absolute_url }}">{{ project.name }}</a>
<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:"N j, Y. P" }}</span>
<ul class="module-item-menu">
{% if project.get_latest_build.success %}
<li><a href="{% url docs_detail project.user.username project.slug "index.html" %}">View Docs</a></li>
{% else %}
<li><a href="{% url builds_project_list project.user.username project.slug %}">No Docs</a></li>
{% endif %}
</ul>
</li>
{% empty %}
<li class="module-item quiet">No projects found</li>
{% endfor %}

2
templates/core/widesearchbar.html
View File

@ -5,7 +5,7 @@
<form action="{% url search %}" method="GET">
<div class="text-input-wrapper">
<input type="text" name="q" value="{{ term }}" id="id_site_search" placeholder="Search docs">
<input type="text" name="q" value="{{ term }}" id="id_site_search" placeholder="Search projects">
</div>
<div class="submit-input-wrapper">
<input type="submit" value="Let's do this.">

2
templates/projects/project_list.html
View File

@ -18,7 +18,7 @@
<div class="module-wrapper">
<div class="module-header">
<h3>Recently Updated</h3>
<h3>Browse projects</h3>
</div>
<div class="module-list">