From 94d68b10b627dc773d71f6beee23ed4ab7b64390 Mon Sep 17 00:00:00 2001 From: Eric Holscher Date: Wed, 18 Aug 2010 04:19:08 +0000 Subject: [PATCH 1/3] Clarify front search is for projects. --- templates/core/widesearchbar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/core/widesearchbar.html b/templates/core/widesearchbar.html index 043730c25..019b2918a 100644 --- a/templates/core/widesearchbar.html +++ b/templates/core/widesearchbar.html @@ -5,7 +5,7 @@
- +
From 6695addb886cd4fdc74fef52215185e0a58ed1bf Mon Sep 17 00:00:00 2001 From: Charles Leifer Date: Wed, 18 Aug 2010 23:09:54 -0500 Subject: [PATCH 2/3] No stompy --- media/css/core.css | 4 ++++ templates/core/project_bar.html | 22 +++++++++++++----- templates/core/project_list_detailed.html | 28 +++++++++++++---------- templates/projects/project_list.html | 2 +- 4 files changed, 37 insertions(+), 19 deletions(-) diff --git a/media/css/core.css b/media/css/core.css index 5951b7576..dd8272e50 100644 --- a/media/css/core.css +++ b/media/css/core.css @@ -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 */ diff --git a/templates/core/project_bar.html b/templates/core/project_bar.html index 5c0e9dc19..ac781a3f2 100644 --- a/templates/core/project_bar.html +++ b/templates/core/project_bar.html @@ -12,19 +12,29 @@
+ + {% if project.get_latest_build %} + {% if not project.get_latest_build.success %} +

Build failed (why)

+ {% endif %} + {% else %} +

We currently have no builds for this project!{% if request.user == project.user %} Is the repo correct?{% endif %}

+ {% endif %}
diff --git a/templates/core/project_list_detailed.html b/templates/core/project_list_detailed.html index f57c10908..7f2f86c48 100644 --- a/templates/core/project_list_detailed.html +++ b/templates/core/project_list_detailed.html @@ -1,14 +1,18 @@ - {% for project in project_list %} -
  • - {{ project.name }} - ({{ project.user }}) - {% if project.version %}version {{ project.version }} -{% endif %} {{ project.modified_date|date:"N j, Y. P" }} - -
  • - {% empty %} -
  • No projects found
  • - {% endfor %} +{% for project in project_list %} +
  • + {{ project.name }} + ({{ project.user }}) + {% if project.version %}version {{ project.version }} -{% endif %} {{ project.modified_date|date:"N j, Y. P" }} +
      + {% if project.get_latest_build.success %} +
    • View Docs
    • + {% else %} +
    • No Docs
    • + {% endif %} +
    +
  • +{% empty %} +
  • No projects found
  • +{% endfor %} diff --git a/templates/projects/project_list.html b/templates/projects/project_list.html index 87e7493a7..625b7bbdc 100644 --- a/templates/projects/project_list.html +++ b/templates/projects/project_list.html @@ -18,7 +18,7 @@
    -

    Recently Updated

    +

    Browse projects

    From 2f1298fd92bb146a5f8d97202e94424caaa3c9dd Mon Sep 17 00:00:00 2001 From: Eric Holscher Date: Thu, 19 Aug 2010 04:35:04 +0000 Subject: [PATCH 3/3] Small fix to make hg support actually work (we need tests) --- projects/tasks.py | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tasks.py b/projects/tasks.py index 187cedee9..2a5388dbe 100644 --- a/projects/tasks.py +++ b/projects/tasks.py @@ -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')