Merge lp:~cjohnston/qa-dashboard/rel-path into lp:qa-dashboard

[Chris Johnston]

Switch assets to using rel-path

Dashboard plan for charming:

- Add all assets back to lp:qa-dashboard
- Create 'assets' branch for the web team to use to include in assets.u.c (lp:qa-dashboard/assets)
- Create a script to automatically copy staticfiles from lp:qa-dashboard to lp:qa-dashboard/assets when there is an update to assets
- Switch the dashboard to use assets.ubuntu.com for static assets
  * this is the reason for the change in paths in this MP. making the paths relative will cause the site to use the proper assets

Since the assets will be versioned, I will be adding the ability to the script above to update what revision the site needs to look for in assets.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:689
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/263/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/263/rebuild

review: Approve (continuous-integration)

[Andy Doan (doanac)]

can you elaborate a little? ie - I think you are doing this because you just moved the assets back into our code-base in plans for a new way to use assets.ubuntu.com. However, maybe sharing the whole plan up-front will allow us to understand if each MP makes sense.

[Andy Doan (doanac)]

review: Approve

=== modified file 'common/static/css/jquery.dataTables.css'
--- common/static/css/jquery.dataTables.css	2013-04-29 17:43:14 +0000
+++ common/static/css/jquery.dataTables.css	2013-12-02 13:46:27 +0000
@@ -1,4 +1,3 @@
-
 /*
  * Table
  */
@@ -33,17 +32,6 @@
 	text-align: center;
 }
 
-/*
-table.dataTable tr.odd { background-color: #E2E4FF; }
-table.dataTable tr.even { background-color: white; }
-
-table.dataTable tr.odd td.sorting_1 { background-color: #D3D6FF; }
-table.dataTable tr.odd td.sorting_2 { background-color: #DADCFF; }
-table.dataTable tr.odd td.sorting_3 { background-color: #E0E2FF; }
-table.dataTable tr.even td.sorting_1 { background-color: #EAEBFF; }
-table.dataTable tr.even td.sorting_2 { background-color: #F2F3FF; }
-table.dataTable tr.even td.sorting_3 { background-color: #F9F9FF; }
-*/
 
 /*
  * Table wrapper
@@ -127,13 +115,13 @@
 	margin-left: 10px;
 }
 
-.paginate_enabled_previous { background: url('//assets.ubuntu.com/sites/dashboard/img/back_enabled.png') no-repeat top left; }
-.paginate_enabled_previous:hover { background: url('//assets.ubuntu.com/sites/dashboard/img/back_enabled_hover.png') no-repeat top left; }
-.paginate_disabled_previous { background: url('//assets.ubuntu.com/sites/dashboard/img/back_disabled.png') no-repeat top left; }
+.paginate_enabled_previous { background: url('../images/back_enabled.png') no-repeat top left; }
+.paginate_enabled_previous:hover { background: url('../images/back_enabled_hover.png') no-repeat top left; }
+.paginate_disabled_previous { background: url('../images/back_disabled.png') no-repeat top left; }
 
-.paginate_enabled_next { background: url('//assets.ubuntu.com/sites/dashboard/img/forward_enabled.png') no-repeat top right; }
-.paginate_enabled_next:hover { background: url('//assets.ubuntu.com/sites/dashboard/img/forward_enabled_hover.png') no-repeat top right; }
-.paginate_disabled_next { background: url('//assets.ubuntu.com/sites/dashboard/img/forward_disabled.png') no-repeat top right; }
+.paginate_enabled_next { background: url('../images/forward_enabled.png') no-repeat top right; }
+.paginate_enabled_next:hover { background: url('../images/forward_enabled_hover.png') no-repeat top right; }
+.paginate_disabled_next { background: url('../images/forward_disabled.png') no-repeat top right; }
 
 /* Full number pagination */
 .paging_full_numbers {
@@ -197,12 +185,12 @@
 /*
  * Sorting
  */
-.sorting { background: url('//assets.ubuntu.com/sites/dashboard/img/sort_both.png') no-repeat center right; }
-.sorting_asc { background: url('//assets.ubuntu.com/sites/dashboard/img/sort_asc.png') no-repeat center right; }
-.sorting_desc { background: url('//assets.ubuntu.com/sites/dashboard/img/sort_desc.png') no-repeat center right; }
+.sorting { background: url('../images/sort_both.png') no-repeat center right; }
+.sorting_asc { background: url('../images/sort_asc.png') no-repeat center right; }
+.sorting_desc { background: url('../images/sort_desc.png') no-repeat center right; }
 
-.sorting_asc_disabled { background: url('//assets.ubuntu.com/sites/dashboard/img/sort_asc_disabled.png') no-repeat center right; }
-.sorting_desc_disabled { background: url('//assets.ubuntu.com/sites/dashboard/img/sort_desc_disabled.png') no-repeat center right; }
+.sorting_asc_disabled { background: url('../images/sort_asc_disabled.png') no-repeat center right; }
+.sorting_desc_disabled { background: url('../images/sort_desc_disabled.png') no-repeat center right; }
  
 table.dataTable th:active {
 	outline: none;

=== modified file 'common/static/css/new-style.css'
--- common/static/css/new-style.css	2013-10-25 15:37:12 +0000
+++ common/static/css/new-style.css	2013-12-02 13:46:27 +0000
@@ -2,7 +2,7 @@
     font-size : 100%;
 }
 body {
-    background : url("/static/images/body_bg.jpg") #fff;
+    background : url("../images/body_bg.jpg") #fff;
     color : #333;
     font-family : Ubuntu, Arial, "libra sans", sans-serif;
     font-weight : 300;
@@ -214,7 +214,7 @@
     margin-left : 20px;
     top : -8px;
     width : 200px;
-    background-image : url("/static/images/arrow-up-smaller.png");
+    background-image : url("../images/arrow-up-smaller.png");
 }
 header.banner .nav-primary li ul li {
     border : none 0;
@@ -557,4 +557,3 @@
 .clear {
     clear: both;
 }
-

=== modified file 'common/static/css/style.css'
--- common/static/css/style.css	2013-10-25 15:37:12 +0000
+++ common/static/css/style.css	2013-12-02 13:46:27 +0000
@@ -196,13 +196,13 @@
 }
 
 .left_nav li.active {
- background: url("//assets.ubuntu.com/sites/dashboard/img/eng_hex.svg") no-repeat;
+ background: url("../images/eng_hex.svg") no-repeat;
  background-size: 16px 16px;
  background-position: left;
 }
 
 .error-14x14 {
-    background: url("//assets.ubuntu.com/sites/dashboard/img/activity-small-icon-vertical.png") no-repeat;
+    background: url("../images/activity-small-icon-vertical.png") no-repeat;
     background-position:left -14px;
 }
 
@@ -379,7 +379,7 @@
 }
 
 div.movement-up {
- background: url("//assets.ubuntu.com/sites/dashboard/img/red-up.svg") no-repeat;
+ background: url("../images/red-up.svg") no-repeat;
  background-size: 20px 20px;
  text-indent: -999px;
  width: 100%;
@@ -387,7 +387,7 @@
 }
 
 div.movement-down {
- background: url("//assets.ubuntu.com/sites/dashboard/img/green-down.svg") no-repeat;
+ background: url("../images/green-down.svg") no-repeat;
  background-size: 20px 20px;
  text-indent: -999px;
  width: 100%;
@@ -395,7 +395,7 @@
 }
 
 div.movement-up-inverse {
- background: url("//assets.ubuntu.com/sites/dashboard/img/green-up.svg") no-repeat;
+ background: url("../images/green-up.svg") no-repeat;
  background-size: 20px 20px;
  text-indent: -999px;
  width: 100%;
@@ -403,7 +403,7 @@
 }
 
 div.movement-down-inverse {
- background: url("//assets.ubuntu.com/sites/dashboard/img/red-down.svg") no-repeat;
+ background: url("../images/red-down.svg") no-repeat;
  background-size: 20px 20px;
  text-indent: -999px;
  width: 100%;
@@ -482,7 +482,7 @@
 }
 
 div.help {
-  background: url("//assets.ubuntu.com/sites/dashboard/img/help.svg") no-repeat;
+  background: url("../images/help.svg") no-repeat;
   background-size: 24px 24px;
   text-indent: -999px;
   display: inline-block;
@@ -590,7 +590,7 @@
 }
 
 .list-ubuntu li {
-  background-image: url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/tick-orange.png");
+  background-image: url("../images/tick-orange.png");
 }
     
 ul.artifacts {

=== added file 'common/static/images/tick-orange.png'
Binary files common/static/images/tick-orange.png	1970-01-01 00:00:00 +0000 and common/static/images/tick-orange.png	2013-12-02 13:46:27 +0000 differ