aligning the Whats this? links for all pages

SUSE · Jun 13, 2016 · c886e90 · c886e90
1 parent 33ac4c7
commit c886e90
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 23 deletions.
diff --git a/app/views/namespaces/index.html.slim b/app/views/namespaces/index.html.slim
@@ -1,11 +1,14 @@
-.btn-toolbar
-  a.btn.btn-xs.btn-link.pull-right[data-placement="left" data-toggle="popover" data-container=".btn-toolbar" data-content="A namespace groups a series of repositories." data-original-title="What's this?" tabindex="0"]
-    i.fa.fa-info-circle
-    | What's this?
-
 .panel.panel-default
   .panel-heading
     h5
+      small
+        a[data-placement="right"
+          data-toggle="popover"
+          data-container=".panel-heading"
+          data-content="<p>A namespace groups a series of repositories.</p>"
+          data-original-title="What's this?"
+          tabindex="0" data-html="true"]
+            i.fa.fa-info-circle
       ' Special namespaces
   .panel-body
     .table-responsive

diff --git a/app/views/namespaces/show.html.slim b/app/views/namespaces/show.html.slim
@@ -3,9 +3,6 @@
     .row
       .col-sm-6
         h5
-          strong
-            '#{@namespace.clean_name}
-          ' namespace
           small
             a[data-placement="right"
               data-toggle="popover"
@@ -14,6 +11,9 @@
               data-original-title="What's this?"
               tabindex="0" data-html="true"]
                 i.fa.fa-info-circle
+          strong
+            '#{@namespace.clean_name}
+          ' namespace
       .col-sm-6.text-right
         - if can_manage_namespace?(@namespace)
           button.btn.btn-link.btn-xs.btn-edit-role[

diff --git a/app/views/webhooks/index.html.slim b/app/views/webhooks/index.html.slim
@@ -24,23 +24,29 @@
         .col-md-offset-2.col-md-7
           = f.submit('Create', class: 'btn btn-primary')
 
-span
-  a[data-placement="right" data-toggle="popover" data-container="span" data-content="A webhook is an HTTP callback which is triggered after an event, e.g. a push event, occurs." data-original-title="What's this?" tabindex="0"]
-    i.fa.fa-info-circle
-    | What's this?
 .panel.panel-default
   .panel-heading
-    h5
-      ' Webhooks for
-      - if @namespace.name == "portus_global_namespace_1"
-        strong
-         = link_to " global namespace", @namespace
-      - else
-        ' namespace
-        strong
-          = link_to @namespace.name, @namespace
-      - if can_manage_namespace?(@namespace)
-        .pull-right
+    .row
+      .col-sm-6
+        h5
+          small
+            a[data-placement="right"
+              data-toggle="popover"
+              data-container=".panel-heading"
+              data-content="<p>A webhook is an HTTP callback which is triggered after an event, e.g. a push event, occurs.</p>"
+              data-original-title="What's this?"
+              tabindex="0" data-html="true"]
+                i.fa.fa-info-circle
+          ' Webhooks for
+          - if @namespace.name == "portus_global_namespace_1"
+            strong
+             = link_to " global namespace", @namespace
+          - else
+            ' namespace
+            strong
+              = link_to @namespace.name, @namespace
+      .col-sm-6.text-right
+        - if can_manage_namespace?(@namespace)
           a#add_webhook_btn.btn.btn-xs.btn-link.js-toggle-button[role="button"]
             i.fa.fa-plus-circle
             | Create new webhook