Bug #1765276: Changed all input-group-btns to input-group-append, fixed collapsibles

behatnotneeded

Change-Id: Ia0905c5ece7eb750f37d05d6a28211318ab8351b

htdocs/admin/users/bulk.php

@@ -106,7 +106,7 @@ $suspendform = pieform(array(
                 'suspend' => array(
                     'type'        => 'button',
                     'usebuttontag' => true,
-                    'class'       => 'btn-secondary input-group-btn no-label',
+                    'class'       => 'btn-secondary input-group-append no-label',
                     'value'       => get_string('Suspend', 'admin'),
                 )
             )
@@ -136,7 +136,7 @@ if (count($options) > 1) {
                     'changeauth' => array(
                         'type'        => 'button',
                         'usebuttontag' => true,
-                        'class'       => 'btn-secondary input-group-btn',
+                        'class'       => 'btn-secondary input-group-append',
                         'value'        => get_string('changeauthmethod', 'admin')
                     )
                 )
@@ -167,7 +167,7 @@ if (is_using_probation()) {
                     'setprobation' => array(
                         'type' => 'button',
                         'usebuttontag' => true,
-                        'class'       => 'btn-secondary input-group-btn no-label',
+                        'class'       => 'btn-secondary input-group-append no-label',
                         'confirm' => get_string('probationbulkconfirm', 'admin'),
                         'value' => get_string('probationbulkset', 'admin'),
                     )

htdocs/admin/users/institutions.php

@@ -711,7 +711,7 @@ else {
                     'submit' => array(
                         'type'  => 'button',
                         'usebuttontag' => true,
-                        'class' => 'btn-primary input-group-btn',
+                        'class' => 'btn-primary input-group-append',
                         'value' => get_string('search'),
                     )
                 ),

htdocs/group/index.php

@@ -94,7 +94,7 @@ if (get_config('allowgroupcategories')
 
     $searchfield = array(
         'type' => 'submit',
-        'class' => 'btn-primary input-group-btn no-label button',
+        'class' => 'btn-primary input-group-append no-label button',
         'value' => get_string('search')
     );
 

htdocs/group/members.php

@@ -146,7 +146,7 @@ $searchform = pieform(array(
                 'submit' => array(
                     'type' => 'button',
                     'usebuttontag' => true,
-                    'class' => 'btn-primary no-label input-group-btn',
+                    'class' => 'btn-primary no-label input-group-append',
                     'value' => get_string('search')
                 )
             )

htdocs/lib/group.php

@@ -1576,7 +1576,7 @@ function group_view_submission_form($groupid) {
                     'submit' => array(
                         'type' => 'button',
                         'usebuttontag' => true,
-                        'class' => 'btn-primary input-group-btn ',
+                        'class' => 'btn-primary input-group-append ',
                         'value' => get_string('submit')
                     ),
                 ),

htdocs/lib/view.php

@@ -4426,7 +4426,7 @@ class View {
                          'submit' => array(
                             'type' => 'button',
                             'usebuttontag' => true,
-                            'class' => 'btn-primary input-group-btn no-label',
+                            'class' => 'btn-primary input-group-append no-label',
                             'value' => get_string('search')
                         )
                     )
@@ -7537,7 +7537,7 @@ function view_group_submission_form($view, $tutorgroupdata, $returnto=null) {
                     'submit' => array(
                         'type' => 'button',
                         'usebuttontag' => true,
-                        'class' => 'btn-primary input-group-btn',
+                        'class' => 'btn-primary input-group-append',
                         'value' => get_string('submit')
                     )
                 ),

htdocs/lib/web.php

@@ -4667,7 +4667,7 @@ function language_select_form() {
                         'changelang' => array(
                             'type' => 'button',
                             'usebuttontag' => true,
-                            'class' => 'btn-secondary input-group-btn',
+                            'class' => 'btn-secondary input-group-append',
                             'value' => get_string('change'),
                         )
                     )

htdocs/search/elasticsearch/lib.php

@@ -209,7 +209,7 @@ class PluginSearchElasticsearch extends PluginSearch {
                         ),
                         'submit' => array(
                             'type' => 'button',
-                            'class' => 'btn-secondary input-group-btn',
+                            'class' => 'btn-secondary input-group-append',
                             'usebuttontag' => true,
                             'value' => '<span class="icon icon-search icon-lg" role="presentation" aria-hidden="true"></span><span class="sr-only">'. get_string('go') . '</span>',
                         )

htdocs/search/lib.php

@@ -244,7 +244,7 @@ abstract class PluginSearch extends Plugin implements IPluginSearch {
                         ),
                         'submit' => array(
                             'type' => 'button',
-                            'class' => 'btn-secondary input-group-btn',
+                            'class' => 'btn-secondary input-group-append',
                             'usebuttontag' => true,
                             'value' => '<span class="icon icon-search icon-lg" role="presentation" aria-hidden="true"></span><span class="sr-only">'. get_string('go') . '</span>',
                         )

htdocs/skin/index.php

@@ -56,7 +56,7 @@ $form = pieform(array(
                 'submit' => array(
                     'type' => 'button',
                     'usebuttontag' => true,
-                    'class' => 'btn-primary input-group-btn',
+                    'class' => 'btn-primary input-group-append',
                     'value' => '<span class="icon icon-filter left" role="presentation" aria-hidden="true"></span>' . get_string('filter'),
                 ),
             ),

htdocs/theme/raw/plugintype/artefact/blog/blocktype/recentposts/templates/recentposts.tpl

@@ -14,7 +14,7 @@
                 <option value="{$blog->id}"> {$blog->title} </option>
             {/foreach}
             </select>
-            <span class="input-group-btn">
+            <span class="input-group-append">
                 <a class="btn btn-secondary btnshortcut">
                     <span class="icon icon-plus text-success left" role="presentation" aria-hidden="true"></span> {str tag='shortcutadd' section='artefact.blog'}
                 </a>

htdocs/theme/raw/plugintype/artefact/blog/blocktype/taggedposts/templates/taggedposts.tpl

@@ -7,7 +7,7 @@
                 <select id="blogselect_{$blockid}" class="select form-control">{foreach from=$blogs item=blog}<option value="{$blog->id}"> {$blog->title} </option>{/foreach}</select>
             </span>
             <input class="select" type="hidden" value="{$tagselect}">
-            <span class="input-group-btn">
+            <span class="input-group-append">
                 <a class="btn btnshortcut btn-secondary">
                     <span class="icon icon-plus text-success left" role="presentation" aria-hidden="true"></span>
                     {str tag='shortcutadd' section='artefact.blog'}

htdocs/theme/raw/plugintype/artefact/blog/templates/posts.tpl

@@ -70,7 +70,7 @@
 
         {if $post->files}
         <div class="has-attachment card card-secondary collapsible" id="postfiles_{$post->id}">
-            <h5 class="card-header">
+            <h5 class="card-header has-link">
                 <a class="text-left collapsed" data-toggle="collapse" href="#attach_{$post->id}" aria-expanded="false">
                     <span class="icon left icon-paperclip" role="presentation" aria-hidden="true"></span>
                     <span class="text-small"> {str tag=attachedfiles section=artefact.blog} </span>

htdocs/theme/raw/plugintype/auth/webservice/templates/webservicelogs.tpl

@@ -4,7 +4,7 @@
 {$form|safe}
 </div>
 <div id="results" class="section card card-secondary">
-    <h2 class="card-heading" id="resultsheading">{str tag="Results"}</h2>
+    <h2 class="card-header" id="resultsheading">{str tag="Results"}</h2>
     {if $results}
     <div class="table-responsive">
     <table id="searchresults" class="table table-striped fullwidth listing">

htdocs/theme/raw/sass/_custom.scss

@@ -259,6 +259,7 @@
     }
     .duplicateemail-filter {
         margin-top: 10px;
+        justify-content: flex-start;
     }
 }
 
@@ -665,3 +666,18 @@ a[type="submit"],
 .card-header a[type="button"] {
     -webkit-appearance: none;
 }
+
+// Used when you really only need flex on an item
+.flexbox {
+    display: flex;
+}
+
+// Add space when there are 2 selects next to each other
+.select {
+    + .select {
+        margin-left: 5px;
+    }
+    + .submit:not(.input-group-append) {
+        margin-left: 5px;
+    }
+}

htdocs/theme/raw/sass/components/_list-group.scss

@@ -159,7 +159,7 @@ h4.list-group-item-heading {
         @extend .list-group-item-warning;
     }
     &.published {
-        background: scale-color($card-bg, $lightness: 50%);
+        background: scale-color($card-heading-bg, $lightness: 50%);
     }
     &.flush {
         padding: 10px 0;

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

@@ -119,4 +119,7 @@
             }
         }
     }
+    .collapsible-group {
+        max-width: 100%;
+    }
 }

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

@@ -167,9 +167,11 @@ textarea.resizable {
         padding: 0;
         border-bottom: 0 none;
         align-items: flex-start;
+        display: inline-block;
     }
     &.form-inline-align-bottom .form-group{
         vertical-align: bottom;
+        align-self: flex-end;
     }
     &.form-short {
         select, input:not(.submit) {
@@ -183,6 +185,7 @@ textarea.resizable {
 
 .form-inline-align-bottom a {
     vertical-align: bottom;
+    align-self: flex-end;
 }
 
 .form-control.file {

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

@@ -59,7 +59,7 @@
         flex: 0 1 auto;
     }
 }
-.pieform .input-group-btn {
+.pieform .input-group-append {
     font-size: inherit;
     width: inherit;
     float:left;

htdocs/theme/raw/sass/layout/card/_card-heading.scss

@@ -32,7 +32,7 @@
         }
 
         &.collapsed {
-            background-color: $card-bg;
+            background-color: $card-heading-bg;
             color: $theme-text-color;
             padding: 10px 15px;
             &.outer-link {
@@ -79,3 +79,29 @@
 h2.card-header {
     font-size: $font-size-lg;
 }
+
+.card {
+    &.collapsible:not(.card-block) {
+        .card-header {
+            border: 0;
+            a {
+                border: $card-border-width solid $card-border;
+                border-bottom-width: 0;
+            }
+        }
+        &.last {
+            .card-header {
+                a.collapsed {
+                    border-bottom-width: $card-border-width;
+                }
+            }
+        }
+        &.has-attachment {
+            .card-header {
+                a {
+                    border-width: 0;
+                }
+            }
+        }
+    }
+}