make ui neater (thanks @SteveBarnett)

universalcore · Nov 7, 2014 · 4fd9ec3 · 4fd9ec3
1 parent fcdaf8a
commit 4fd9ec3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/project/templates/unicoremc/home.html b/project/templates/unicoremc/home.html
@@ -26,7 +26,7 @@
                         <div class="grp-text">&nbsp;</div>
                     </th>
                     <th scope="col">
-                        <div class="grp-text">&nbsp;</div>
+                        <div class="grp-text">Content Store</div>
                     </th>
                     <th scope="col">
                         <div class="grp-text">Frontend URL</div>
@@ -47,24 +47,28 @@
 {% block script %}
 <script src="{{STATIC_URL}}js/jquery.min.js"></script>
 <script type="text/javascript">
+
 function reload_projects(){
     $.getJSON('/progress/')
         .done(function(data){
             var projects = new Array();
             $.each(data, function(){
+                var repo_url = this.repo_url.replace(/^(https?):\/\/github.com\//, '');
+                var frontend_url = this.frontend_url.replace(/^(https?):\/\//, '');
+                var cms_url = this.cms_url.replace(/^(https?):\/\//, '');
+
                 var row = '<th>' + this.app_type +'</th>' +
                           '<td>' + this.country + '</td>' +
                           '<td>' + this.state + '</td>' +
-                          '<td><a target="_blank" href="'+ this.repo_url +'">'+ this.repo_url +'</a></td>' +
-                          '<td><a target="_blank" href="'+ this.frontend_url +'">'+ this.frontend_url +'</a></td>' +
-                          '<td><a target="_blank" href="'+ this.cms_url +'">'+ this.cms_url +'</a></td>' +
+                          '<td><a target="_blank" href="'+ this.repo_url +'">'+ repo_url +'</a></td>' +
+                          '<td><a target="_blank" href="'+ this.frontend_url +'">'+ frontend_url +'</a></td>' +
+                          '<td><a target="_blank" href="'+ this.cms_url +'">'+ cms_url +'</a></td>' +
                           {% if user.is_superuser %}
                           '<td><a href="/advanced/'+ this.id +'/">'+ 'edit' +'</a></td>' +
                           {% endif %}
                           '';
 
-                var state_class = this.state == 'Done' ? 'bg-success' : 'bg-warning';
-                console.log(state_class)
+                var state_class = this.state == 'Ready for use' ? 'bg-success' : 'bg-warning';
                 projects.push(
                     $('<tr>').html(row).addClass(state_class));
             });

diff --git a/project/templates/unicoremc/new_project.html b/project/templates/unicoremc/new_project.html
@@ -79,9 +79,9 @@
                 var options = new Array();
                 options.push($('<option>').val('').text('---------'));
                 $.each(data, function(){
-                    if(this.name.startsWith('unicore-cms-content-' + app_name)){
-                        options.push(
-                            $('<option>').val(this.git_url).text(this.name));
+                    if(this.name.startsWith('unicore-cms-content-' + app_name) ||
+                       this.name.startsWith('unicore-cms-content-blank')){
+                        options.push($('<option>').val(this.git_url).text(this.name));
                     }
                 });
                 $('#base_repo').html(options).removeAttr('disabled').change();

diff --git a/unicoremc/states.py b/unicoremc/states.py
@@ -126,7 +126,7 @@ class DbInitialized(State):
 
 
 class Done(State):
-    verbose_name = 'Done'
+    verbose_name = 'Ready for use'
     transitions = {'destroy': 'destroyed'}