Setting the Bootstrap 3 icons and colours, and removing some links from the table data so that we can make clickable items look clickable.
Signed-off-by: Belen Barros Pena <[email protected]> --- .../lib/toaster/toastergui/static/css/default.css | 14 +++++--- bitbake/lib/toaster/toastergui/tables.py | 42 +++++++++------------- 2 files changed, 26 insertions(+), 30 deletions(-) diff --git a/bitbake/lib/toaster/toastergui/static/css/default.css b/bitbake/lib/toaster/toastergui/static/css/default.css index 137e6f5..b6a584b 100644 --- a/bitbake/lib/toaster/toastergui/static/css/default.css +++ b/bitbake/lib/toaster/toastergui/static/css/default.css @@ -34,12 +34,12 @@ img.logo { height: 30px; vertical-align: bottom; } /* Styles for the help information */ .get-help { color: #CCCCCC; } .get-help:hover { color: #999999; cursor: pointer; } -.get-help-green { color: #468847; } -.get-help-green:hover { color: #347132; cursor: pointer; } +.get-help-green { color: #3c763d; } +.get-help-green:hover { color: #2b542c; cursor: pointer; } .get-help-blue { color: #3A87AD; } .get-help-blue:hover { color: #005580; cursor: pointer; } -.get-help-red { color: #B94A48; } -.get-help-red:hover { color: #943A38; cursor: pointer; } +.get-help-red { color: #a94442; } +.get-help-red:hover { color: #843534; cursor: pointer; } /* Styles for our table controls */ .form-control[id^="search-input-"] { width: 30em; } @@ -65,3 +65,9 @@ thead > tr > th > a.sorted { font-weight: bold; color: #333; } /* In table headings, separate the help bubble from the column heading */ thead > tr > th > .glyphicon-question-sign { margin-right: 5px; } + +/* Style build outcome and download icons */ +tbody > tr > td > .glyphicon-ok-circle { color: #3c763d; } +tbody > tr > td > .glyphicon-minus-sign { color: #a94442; } +.glyphicon-download-alt { color: #337ab7; } +.glyphicon-download-alt:hover { color: #23527c; } diff --git a/bitbake/lib/toaster/toastergui/tables.py b/bitbake/lib/toaster/toastergui/tables.py index 29b68de..a5acdb6 100644 --- a/bitbake/lib/toaster/toastergui/tables.py +++ b/bitbake/lib/toaster/toastergui/tables.py @@ -1109,19 +1109,17 @@ class BuildsTable(ToasterTable): def setup_columns(self, *args, **kwargs): outcome_template = ''' - <a href="{% url "builddashboard" data.id %}"> - {% if data.outcome == data.SUCCEEDED %} - <i class="icon-ok-sign success"></i> - {% elif data.outcome == data.FAILED %} - <i class="icon-minus-sign error"></i> - {% endif %} - </a> + {% if data.outcome == data.SUCCEEDED %} + <span class="glyphicon glyphicon-ok-circle"></span> + {% elif data.outcome == data.FAILED %} + <span class="glyphicon glyphicon-minus-sign"></span> + {% endif %} {% if data.cooker_log_path %} <a href="{% url "build_artifact" data.id "cookerlog" data.id %}"> - <i class="icon-download-alt get-help" - data-original-title="Download build log"></i> + <span class="glyphicon glyphicon-download-alt get-help" + data-original-title="Download build log"></span> </a> {% endif %} ''' @@ -1136,27 +1134,21 @@ class BuildsTable(ToasterTable): ''' machine_template = ''' - <a href="{% url "builddashboard" data.id %}"> - {{data.machine}} - </a> + {{data.machine}} ''' started_on_template = ''' - <a href="{% url "builddashboard" data.id %}"> - {{data.started_on | date:"d/m/y H:i"}} - </a> + {{data.started_on | date:"d/m/y H:i"}} ''' completed_on_template = ''' - <a href="{% url "builddashboard" data.id %}"> - {{data.completed_on | date:"d/m/y H:i"}} - </a> + {{data.completed_on | date:"d/m/y H:i"}} ''' failed_tasks_template = ''' {% if data.failed_tasks.count == 1 %} <a href="{% url "task" data.id data.failed_tasks.0.id %}"> - <span class="error"> + <span class="text-danger"> {{data.failed_tasks.0.recipe.name}}.{{data.failed_tasks.0.task_name}} </span> </a> @@ -1167,14 +1159,14 @@ class BuildsTable(ToasterTable): </a> {% elif data.failed_tasks.count > 1 %} <a href="{% url "tasks" data.id %}?filter=outcome%3A{{extra.Task.OUTCOME_FAILED}}"> - <span class="error">{{data.failed_tasks.count}} tasks</span> + <span class="text-danger">{{data.failed_tasks.count}} tasks</span> </a> {% endif %} ''' errors_template = ''' {% if data.errors_no %} - <a class="errors.count error" href="{% url "builddashboard" data.id %}#errors"> + <a class="errors.count text-danger" href="{% url "builddashboard" data.id %}#errors"> {{data.errors_no}} error{{data.errors_no|pluralize}} </a> {% endif %} @@ -1182,7 +1174,7 @@ class BuildsTable(ToasterTable): warnings_template = ''' {% if data.warnings_no %} - <a class="warnings.count warning" href="{% url "builddashboard" data.id %}#warnings"> + <a class="warnings.count text-warning" href="{% url "builddashboard" data.id %}#warnings"> {{data.warnings_no}} warning{{data.warnings_no|pluralize}} </a> {% endif %} @@ -1197,9 +1189,7 @@ class BuildsTable(ToasterTable): image_files_template = ''' {% if data.outcome == extra.Build.SUCCEEDED %} - <a href="{% url "builddashboard" data.id %}#images"> {{data.get_image_file_extensions}} - </a> {% endif %} ''' @@ -1417,10 +1407,10 @@ class AllBuildsTable(BuildsTable): {{data.project.name}} </a> {% if data.project.is_default %} - <i class="icon-question-sign get-help hover-help" title="" + <span class="glyphicon glyphicon-question-sign get-help hover-help" title="" data-original-title="This project shows information about the builds you start from the command line while Toaster is - running" style="visibility: hidden;"></i> + running" style="visibility: hidden;"></span> {% endif %} ''' -- 1.9.1 -- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
