Merge "Fix webservices result table (bug: 1465107)"

htdocs/admin/users/institutionusers.php

@@ -296,7 +296,7 @@ EOF;
 
 $institutionselector = pieform(array(
     'name' => 'institutionselect',
-    'class' => 'pull-right form-inline',
+    'class' => 'form-inline',
     'elements' => array(
         'institution' => $institutionelement,
     )

htdocs/admin/users/pendingregistrations.php

@@ -41,7 +41,7 @@ else if (!empty($institution)) {
 }
 $institutionselector = pieform(array(
     'name' => 'usertypeselect',
-    'class' => 'form-inline pull-right',
+    'class' => 'form-inline',
     'elements' => array(
         'institution' => $institutionelement,
     )

htdocs/admin/users/progressbar.php

@@ -44,7 +44,7 @@ else if (!empty($institution)) {
 }
 $institutionselector = pieform(array(
     'name' => 'progressbarselect',
-    'class' => 'form-inline pull-right',
+    'class' => 'form-inline',
     'elements' => array(
         'institution' => $institutionelement,
     )

htdocs/admin/users/statistics.php

@@ -49,7 +49,7 @@ else if (!empty($institution)) {
 }
 $institutionselector = pieform(array(
     'name' => 'usertypeselect',
-    'class' => 'pull-right form-inline',
+    'class' => 'form-inline',
     'elements' => array(
         'institution' => $institutionelement,
     )

htdocs/lib/institution.php

@@ -917,7 +917,7 @@ function institution_selector_for_page($institution, $page) {
 
     $institutionselector = pieform(array(
         'name' => 'institutionselect',
-        'class' => 'last form-inline pull-right',
+        'class' => 'form-inline',
         'checkdirtychange' => false,
         'elements' => array(
             'institution' => $institutionelement,

htdocs/theme/default/templates/header.tpl

@@ -92,7 +92,7 @@
 
                             {dynamic}{insert_messages}{/dynamic}
                             {if $institutionselector}
-                                <div class="pull-right institutionselector">
+                                <div class="institutionselector">
                                 {$institutionselector|safe}
                                 </div>
                             {/if}

htdocs/theme/raw/sass/_custom.scss

@@ -155,10 +155,25 @@
 
 // Style label institution selection
 .institutionselector {
-    .form-group {
+    .select {
+        margin-bottom: 15px;
+    }
+    label {
+        font-weight: bold;
+    }
+    @media (min-width: $screen-sm-min) {
+        float: right;
+        width: 50%;
+        .form-group {
+            float: right;
+        }
         label {
-            display: inline;
-            font-weight: bold;
+            display: table-cell;
+            width: auto;
+        }
+        .picker {
+            width: auto;
+            display: table-cell;
         }
     }
 }

htdocs/theme/raw/sass/form/_dropdown.scss

@@ -62,7 +62,7 @@
 
     &.form-condensed {
         .picker {
-             max-width: 67%;
+            max-width: 67%;
         }
     }
 

htdocs/theme/raw/sass/form/_form-group.scss

@@ -185,6 +185,12 @@
         padding: 0;
     }
 
+    &.with-padding {
+        .form-group {
+            padding: 20px 0;
+        }
+    }
+
     &.checkboxes {
         .btn-group {
             margin: 10px 0;

htdocs/theme/raw/sass/typography/_tables.scss

@@ -26,7 +26,7 @@ td.tiny {
         text-transform: uppercase;
         color: $gray;
         font-size: $font-size-base;
-        th {
+        th, td {
             font-weight: 300;
         }
         .allnone-toggles {

htdocs/theme/raw/templates/form.tpl

@@ -6,7 +6,7 @@
 {/if}
 {if $ADMIN || $INSTITUTIONALADMIN}
 <div class="row">
-    <div class="col-md-9">
+    <div class="col-md-12">
         <div class="panel panel-default">
             <div class="panel-body">
                 {$form|safe}

htdocs/theme/raw/templates/header.tpl

@@ -95,7 +95,7 @@
 
                         {dynamic}{insert_messages}{/dynamic}
                         {if $institutionselector}
-                            <div class="pull-right institutionselector">
+                            <div class="institutionselector">
                             {$institutionselector|safe}
                             </div>
                         {/if}

htdocs/webservice/apptokens.php

@@ -115,7 +115,7 @@ if (!empty($dbservices)) {
             $userform['elements']['id' . $service->id . '_enabled'] = array(
                 'value'        => (($service->enabled == 1) ?  display_icon('enabled') : display_icon('disabled')),
                 'type'         => 'html',
-                'class'        => 'center',
+                'class'        => 'text-center',
                 'key'          => $service->id,
             );
             // token for the service if it exists