diff --git a/bitbake/lib/webhob/bldviewer/templates/base.html b/bitbake/lib/webhob/bldviewer/templates/base.html new file mode 100644 index 0000000..ab3c3b7 --- /dev/null +++ b/bitbake/lib/webhob/bldviewer/templates/base.html @@ -0,0 +1,16 @@ + + + + + WebHob Simple Explorer + + + +
Menu: All Builds | All Layers +
+{% block pagecontent %} + +{% endblock %} + + + diff --git a/bitbake/lib/webhob/bldviewer/templates/build.html b/bitbake/lib/webhob/bldviewer/templates/build.html index cd257e0..8ee3800 100644 --- a/bitbake/lib/webhob/bldviewer/templates/build.html +++ b/bitbake/lib/webhob/bldviewer/templates/build.html @@ -1,54 +1,49 @@ - - - - WebHob Build page - - - -

WebHob Builds

- - - - {% load projecttags %} - - - - - - - - - - - - - - - - - - {% for build in builds %} - - - - - - - - - - - - - - - - - - {% endfor %} - -
OutcomeStarted OnCompleted OnTargetImage ?MachineTimeErrorsWarningsOutputLogBitbake VersionBuild Name
{{build.get_outcome_display}}{{build.started_on}}{{build.completed_on}}{{build.target}}{{build.is_image}}{{build.machine.name}}{% time_difference build.started_on build.completed_on %}{{build.errors_no}}{{build.warnings_no}}{{build.image_fstypes}}{{build.cooker_log_path}}{{build.bitbake_version}}{{build.build_name}}
- - - - +{% extends "base.html" %} + +{% block pagecontent %} +

WebHob Builds

+ + + + {% load projecttags %} + + + + + + + + + + + + + + + + + + {% for build in builds %} + + + + + + + + + + + + + + + + + + {% endfor %} + +
OutcomeStarted OnCompleted OnTargetImage ?MachineTimeErrorsWarningsOutputLogBitbake VersionBuild Name
{{build.get_outcome_display}}{{build.started_on}}{{build.completed_on}}{{build.target}}{{build.is_image}}{{build.machine.name}}{% time_difference build.started_on build.completed_on %}{{build.errors_no}}{{build.warnings_no}}{{build.image_fstypes}}{{build.cooker_log_path}}{{build.bitbake_version}}{{build.build_name}}
+{% endblock %} + + diff --git a/bitbake/lib/webhob/bldviewer/templates/layer.html b/bitbake/lib/webhob/bldviewer/templates/layer.html index 24bd86b..9d44f17 100644 --- a/bitbake/lib/webhob/bldviewer/templates/layer.html +++ b/bitbake/lib/webhob/bldviewer/templates/layer.html @@ -1,29 +1,25 @@ - +{% extends "base.html" %} - - WebHob Layer page - +{% block pagecontent %} +

WebHob Layers

- -

WebHob Layers

+ -
+ {% load projecttags %} - {% load projecttags %} - - - - - + + + + - + - {% for layer in layers %} + {% for layer in layers %} - - - - + + + + - - - {% endfor %} + -
NameLocal PathLayer Index URL
NameLocal PathLayer Index URL Known Versions
{{layer.name}}{{layer.local_path}}{{layer.layer_index_url}}
{{layer.name}}{{layer.local_path}}{{layer.layer_index_url}} {% for lv in layer.versions %} {% endfor %}
@@ -31,12 +27,10 @@
+ {% endfor %} - + - +{% endblock %} diff --git a/bitbake/lib/webhob/bldviewer/templates/recipe.html b/bitbake/lib/webhob/bldviewer/templates/recipe.html index 8f5dcb3..5ebd880 100644 --- a/bitbake/lib/webhob/bldviewer/templates/recipe.html +++ b/bitbake/lib/webhob/bldviewer/templates/recipe.html @@ -1,48 +1,42 @@ - - - - WebHob Recipe page - - - -

WebHob Recipes for a Layer

- - - - {% load projecttags %} - - - - - - - - - - - - - - - {% for recipe in recipes %} - - - - - - - - - - - - - - - {% endfor %} - -
NameVersionSummaryDescriptionSectionLicenseHomepageBugtrackerAuthorFile_path
{{recipe.name}}{{recipe.version}}{{recipe.summary}}{{recipe.description}}{{recipe.section}}{{recipe.license}}{{recipe.homepage}}{{recipe.bugtracker}}{{recipe.author}}{{recipe.file_path}}
- - - - +{% extends "base.html" %} + +{% block pagecontent %} +

WebHob Recipes for a Layer

+ + + + {% load projecttags %} + + + + + + + + + + + + + + + {% for recipe in recipes %} + + + + + + + + + + + + + + + {% endfor %} + +
NameVersionSummaryDescriptionSectionLicenseHomepageBugtrackerAuthorFile_path
{{recipe.name}}{{recipe.version}}{{recipe.summary}}{{recipe.description}}{{recipe.section}}{{recipe.license}}{{recipe.homepage}}{{recipe.bugtracker}}{{recipe.author}}{{recipe.file_path}}
+ +{% endblock %} diff --git a/bitbake/lib/webhob/bldviewer/templates/task.html b/bitbake/lib/webhob/bldviewer/templates/task.html index 1797028..88c82d8 100644 --- a/bitbake/lib/webhob/bldviewer/templates/task.html +++ b/bitbake/lib/webhob/bldviewer/templates/task.html @@ -1,72 +1,64 @@ - - - - WebHob Task page - - - - -

WebHob Tasks

- - {% if not tasks %} -

No tasks were executed in this build!

- {% else %} - - - - - - - - - - - - - - - - +{% extends "base.html" %} + +{% block pagecontent %} +

WebHob Tasks

+ + {% if not tasks %} +

No tasks were executed in this build!

+ {% else %} + +
OrderTaskRecipe VersionTask TypeOutcomeErrorsWarningsTimeCPU usageDisk I/OScript typeFile path
+ + + + + + + + + + + + + + - - - {% for task in tasks %} - - - - - - - {% if task.task_executed %} - - {% else %} - - {% endif %} - - - - - - - - - + + + {% for task in tasks %} + + + + + + + {% if task.task_executed %} + + {% else %} + + {% endif %} + + + + + + + + + - - - {% endfor %} - -
OrderTaskRecipe VersionTask TypeOutcomeErrorsWarningsTimeCPU usageDisk I/OScript typeFile path Depends
{{task.order}} - {{task.recipe.name}}.{{task.task_name}}{{task.recipe.version}}ExecutedPrebuilt{{task.get_outcome_display}}{{task.errors_no}}{{task.warnings_no}}{{task.elapsed_time}}{{task.cpu_usage}}{{task.disk_io}}{{task.get_script_type_display}}{{task.recipe.file_path}}
{{task.order}} + {{task.recipe.name}}.{{task.task_name}}{{task.recipe.version}}ExecutedPrebuilt{{task.get_outcome_display}}{{task.errors_no}}{{task.warnings_no}}{{task.elapsed_time}}{{task.cpu_usage}}{{task.disk_io}}{{task.get_script_type_display}}{{task.recipe.file_path}} {% for tt in task.depends_on %} {{tt.recipe.name}}.{{tt.task_name}}
{% endfor %}
+ - {% endif %} + {% endfor %} - + - + {% endif %} +{% endblock %} diff --git a/bitbake/lib/webhob/bldviewer/urls.py b/bitbake/lib/webhob/bldviewer/urls.py index b6c6796..5f07161 100644 --- a/bitbake/lib/webhob/bldviewer/urls.py +++ b/bitbake/lib/webhob/bldviewer/urls.py @@ -5,6 +5,6 @@ urlpatterns = patterns('bldviewer.views', url(r'^build/$', 'build', name='build'), url(r'^build/(?P\d+)/task/$', 'task', name='task'), url(r'^layer/$', 'layer', name='layer'), - url(r'^layerversions/(?P\d+)/recipes$', 'layer_versions_recipes', name='layer_versions_recipes'), + url(r'^layerversions/(?P\d+)/recipes/.*$', 'layer_versions_recipes', name='layer_versions_recipes'), url(r'^$', redirect_to, {'url': 'build/'}), )