Fixup trove screens for Bootstrap 3 changes

Changed row-fluid
Selected new icons in a few places
Cleanup html for details pages
Added default button to resize dialog

Change-Id: I80fbccf77e6a27a51f84dd55cab7944f23d38d66
Closes-Bug: #1350514

openstack_dashboard/dashboards/project/database_backups/tables.py

@@ -36,8 +36,8 @@ class LaunchLink(tables.LinkAction):
     name = "create"
     verbose_name = _("Create Backup")
     url = "horizon:project:database_backups:create"
-    classes = ("ajax-modal", "btn-launch")
-    icon = "cloud-upload"
+    classes = ("ajax-modal", "btn-create")
+    icon = "camera"
 
 
 class RestoreLink(tables.LinkAction):
@@ -59,7 +59,7 @@ class DownloadBackup(tables.LinkAction):
     name = "download"
     verbose_name = _("Download Backup")
     url = 'horizon:project:containers:object_download'
-    classes = ("btn-launch",)
+    classes = ("btn-download",)
 
     def get_link_url(self, datum):
         ref = datum.locationRef.split('/')
@@ -73,16 +73,11 @@ class DownloadBackup(tables.LinkAction):
         return datum.status == 'COMPLETED'
 
 
-class DeleteBackup(tables.BatchAction):
-    name = "delete"
-    action_present = _("Delete")
-    action_past = _("Scheduled deletion of %(data_type)s")
+class DeleteBackup(tables.DeleteAction):
     data_type_singular = _("Backup")
     data_type_plural = _("Backups")
-    classes = ("ajax-modal",)
-    icon = "remove"
 
-    def action(self, request, obj_id):
+    def delete(self, request, obj_id):
         api.trove.backup_delete(request, obj_id)
 
 

openstack_dashboard/dashboards/project/database_backups/templates/database_backups/details.html

@@ -43,7 +43,7 @@
     </div>
 
     {% if backup.parent %}
-    <div class="status row-fluid detail">
+    <div class="status row detail">
       <h4>{% trans "Incremental Backup" %}</h4>
       <hr class="header_rule">
       <dl>

openstack_dashboard/dashboards/project/databases/tables.py

@@ -35,7 +35,7 @@ class TerminateInstance(tables.BatchAction):
     action_past = _("Scheduled termination of %(data_type)s")
     data_type_singular = _("Instance")
     data_type_plural = _("Instances")
-    classes = ("ajax-modal",)
+    classes = ("btn-danger", )
     icon = "off"
 
     def action(self, request, obj_id):
@@ -59,9 +59,6 @@ class RestartInstance(tables.BatchAction):
 
 
 class DeleteUser(tables.DeleteAction):
-    name = "delete"
-    action_present = _("Delete")
-    action_past = _("Deleted")
     data_type_singular = _("User")
     data_type_plural = _("Users")
 
@@ -75,9 +72,6 @@ class DeleteUser(tables.DeleteAction):
 
 
 class DeleteDatabase(tables.DeleteAction):
-    name = "delete"
-    action_present = _("Delete")
-    action_past = _("Deleted")
     data_type_singular = _("Database")
     data_type_plural = _("Databases")
 

openstack_dashboard/dashboards/project/databases/templates/databases/_detail_overview.html

@@ -19,7 +19,7 @@
   </dl>
 </div>
 
-<div class="specs row-fluid detail">
+<div class="specs row detail">
   <h4>{% trans "Specs" %}</h4>
   <hr class="header_rule">
   <dl>
@@ -40,18 +40,3 @@
 
 {% block connection_info %}
 {% endblock %}
-<div class="addresses row detail">
-  <h4>{% trans "Connection Info" %}</h4>
-  <hr class="header_rule">
-  <dl>
-    {% with instance.host as host %}
-    <dt>{% trans "Host" %}</dt>
-    <dd>{{ host }}</dd>
-    <dt>{% trans "Database Port" %}</dt>
-    <dd>3306</dd> {# TODO: This should be a config #}
-    <dt>{% trans "Connection Examples" %}</dt>
-    <dd>mysql -h {{ host }} -u USERNAME -p</dd>
-    <dd>mysql://USERNAME:PASSWORD@{{ host }}:3306/DATABASE</dd>
-    {% endwith %}
-  </dl>
-</div>

openstack_dashboard/dashboards/project/databases/templates/databases/_detail_overview_cassandra.html

@@ -2,23 +2,20 @@
 {% load i18n sizeformat %}
 
 {% block connection_info %}
-    <div class="addresses row-fluid detail">
+    <div class="addresses row detail">
     <h4>{% trans "Connection Info" %}</h4>
     <hr class="header_rule">
     <dl>
         {% with instance.host as host %}
             <dt>{% trans "Host" %}</dt>
-            <dd>
             {% if not host %}
-                {% trans "Not Assigned" %}
-            </dd>
+                <dd>{% trans "Not Assigned" %}</dd>
             {% else %}
-                {{ host }}
-            </dd>
-            <dt>{% trans "Database Port" %}</dt>
-            <dd>9160</dd>
-            <dt>{% trans "Connection Examples" %}</dt>
-            <dd>cqlsh {{ host }} 9160</dd>
+                <dd>{{ host }}</dd>
+                <dt>{% trans "Database Port" %}</dt>
+                <dd>9160</dd>
+                <dt>{% trans "Connection Examples" %}</dt>
+                <dd>cqlsh {{ host }} 9160</dd>
             {% endif %} <!-- ends else block -->
         {% endwith %}
     </dl>

openstack_dashboard/dashboards/project/databases/templates/databases/_detail_overview_couchbase.html

@@ -2,21 +2,18 @@
 {% load i18n sizeformat %}
 
 {% block connection_info %}
-    <div class="addresses row-fluid detail">
+    <div class="addresses row detail">
     <h4>{% trans "Connection Info" %}</h4>
     <hr class="header_rule">
     <dl>
         {% with instance.host as host %}
             <dt>{% trans "Host" %}</dt>
-            <dd>
             {% if not host %}
-                {% trans "Not Assigned" %}
-            </dd>
+                <dd>{% trans "Not Assigned" %}</dd>
             {% else %}
-                {{ host }}
-            </dd>
-            <dt>{% trans "Connection Examples" %}</dt>
-            <dd>http://{{ host }}:8091</dd>
+                <dd>{{ host }}</dd>
+                <dt>{% trans "Connection Examples" %}</dt>
+                <dd>http://{{ host }}:8091</dd>
             {% endif %} <!-- ends else block -->
         {% endwith %}
     </dl>

openstack_dashboard/dashboards/project/databases/templates/databases/_detail_overview_mongodb.html

@@ -2,24 +2,21 @@
 {% load i18n sizeformat %}
 
 {% block connection_info %}
-    <div class="addresses row-fluid detail">
+    <div class="addresses row detail">
     <h4>{% trans "Connection Info" %}</h4>
     <hr class="header_rule">
     <dl>
         {% with instance.host as host %}
             <dt>{% trans "Host" %}</dt>
-            <dd>
             {% if not host %}
-                {% trans "Not Assigned" %}
-            </dd>
+                <dd>{% trans "Not Assigned" %}</dd>
             {% else %}
-                {{ host }}
-            </dd>
-            <dt>{% trans "Database Port" %}</dt>
-            <dd>27017</dd>
-            <dt>{% trans "Connection Examples" %}</dt>
-            <dd>mongo --host {{ host }}</dd>
-            <dd>mongodb://[{% trans "USERNAME" %}:{% trans "PASSWORD" %}@]{{ host }}:27017/{% trans "DATABASE" %}</dd>
+                <dd>{{ host }}</dd>
+                <dt>{% trans "Database Port" %}</dt>
+                <dd>27017</dd>
+                <dt>{% trans "Connection Examples" %}</dt>
+                <dd>mongo --host {{ host }}</dd>
+                <dd>mongodb://[{% trans "USERNAME" %}:{% trans "PASSWORD" %}@]{{ host }}:27017/{% trans "DATABASE" %}</dd>
             {% endif %} <!-- ends else block -->
         {% endwith %}
     </dl>

openstack_dashboard/dashboards/project/databases/templates/databases/_detail_overview_mysql.html

@@ -2,24 +2,21 @@
 {% load i18n sizeformat %}
 
 {% block connection_info %}
-    <div class="addresses row-fluid detail">
+    <div class="addresses row detail">
     <h4>{% trans "Connection Info" %}</h4>
     <hr class="header_rule">
     <dl>
         {% with instance.host as host %}
             <dt>{% trans "Host" %}</dt>
-            <dd>
             {% if not host %}
-                {% trans "Not Assigned" %}
-            </dd>
+                <dd>{% trans "Not Assigned" %}</dd>
             {% else %}
-                {{ host }}
-            </dd>
-            <dt>{% trans "Database Port" %}</dt>
-            <dd>3306</dd>
-            <dt>{% trans "Connection Examples" %}</dt>
-            <dd>mysql -h {{ host }} -u {% trans "USERNAME" %} -p</dd>
-            <dd>mysql://{% trans "USERNAME" %}:{% trans "PASSWORD" %}@{{ host }}:3306/{% trans "DATABASE"%}</dd>
+                <dd>{{ host }}</dd>
+                <dt>{% trans "Database Port" %}</dt>
+                <dd>3306</dd>
+                <dt>{% trans "Connection Examples" %}</dt>
+                <dd>mysql -h {{ host }} -u {% trans "USERNAME" %} -p</dd>
+                <dd>mysql://{% trans "USERNAME" %}:{% trans "PASSWORD" %}@{{ host }}:3306/{% trans "DATABASE"%}</dd>
             {% endif %} <!-- ends else block -->
         {% endwith %}
     </dl>

openstack_dashboard/dashboards/project/databases/templates/databases/_detail_overview_redis.html

@@ -2,21 +2,18 @@
 {% load i18n sizeformat %}
 
 {% block connection_info %}
-    <div class="addresses row-fluid detail">
+    <div class="addresses row detail">
     <h4>{% trans "Connection Info" %}</h4>
     <hr class="header_rule">
     <dl>
         {% with instance.host as host %}
             <dt>{% trans "Host" %}</dt>
-            <dd>
             {% if not host %}
-                {% trans "Not Assigned" %}
-            </dd>
+                <dd>{% trans "Not Assigned" %}</dd>
             {% else %}
-                {{ host }}
-            </dd>
-            <dt>{% trans "Connection Examples" %}</dt>
-            <dd>redis-cli -h {{ host }}</dd>
+                <dd>{{ host }}</dd>
+                <dt>{% trans "Connection Examples" %}</dt>
+                <dd>redis-cli -h {{ host }}</dd>
             {% endif %} <!-- ends else block -->
         {% endwith %}
     </dl>

openstack_dashboard/dashboards/project/databases/templates/databases/_detail_users.html

@@ -1,3 +0,0 @@
-{% load i18n %}
-
-{{ table.render }}

openstack_dashboard/dashboards/project/databases/templates/databases/_resize_volume.html

@@ -22,6 +22,6 @@
 
 {% block modal-footer %}
   <input class="btn btn-primary pull-right" type="submit" value="{% trans "Resize Database Volume" %}" />
-  <a href="{% url "horizon:project:databases:index" %}" class="btn secondary cancel close">{% trans "Cancel" %}</a>
+  <a href="{% url "horizon:project:databases:index" %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
 {% endblock %}