Merge pull request #197 from CodeForPhilly/features/bootstrap4

Migrate to Bootstrap 4

Author: themightychris

.holo/branches/emergence-site/site-root/css/lib/_bootstrap-combobox.toml

@@ -0,0 +1,6 @@
+[holomapping]
+root = "css"
+files = [
+    "bootstrap-combobox.css"
+]
+after = [ "skeleton-v2" ]

.holo/branches/emergence-site/site-root/css/lib/_select2.toml

@@ -0,0 +1,6 @@
+[holomapping]
+root = "dist/css"
+files = [
+    "select2.css"
+]
+after = [ "skeleton-v2" ]

.holo/branches/emergence-site/site-root/js/lib/_bootstrap-combobox.toml

@@ -0,0 +1,6 @@
+[holomapping]
+root = "js"
+files = [
+    "bootstrap-combobox.js"
+]
+after = [ "skeleton-v2" ]

.holo/branches/emergence-site/site-root/js/lib/_select2.toml

@@ -0,0 +1,6 @@
+[holomapping]
+root = "dist/js"
+files = [
+    "select2.js"
+]
+after = [ "skeleton-v2" ]

.holo/sources/bootstrap-combobox.toml

@@ -0,0 +1,3 @@
+[holosource]
+url = "https://github.com/y-code/bootstrap-combobox.git"
+ref = "refs/heads/bootstrap4-support"

.holo/sources/select2.toml

@@ -0,0 +1,3 @@
+[holosource]
+url = "https://github.com/select2/select2.git"
+ref = "refs/heads/4.x"

html-templates/blog/blogPost.tpl

@@ -73,7 +73,7 @@
                 {if Emergence\CMS\BlogRequestHandler::checkWriteAccess($Post)}
                     <div class="btn-toolbar pull-right">
                         <div class="btn-group">
-                            <a href="{$Post->getURL()}/edit" class="btn btn-default">{*glyph "pencil"*} {_ Edit}</a>
+                            <a href="{$Post->getURL()}/edit" class="btn btn-secondary">{*glyph "pencil"*} {_ Edit}</a>
                             <a href="{$Post->getURL()}/delete"
                                class="btn btn-danger confirm"
                                data-confirm-yes="Delete Post"
@@ -112,4 +112,4 @@
 
     {/block}
     </div>
-{/block}
+{/block}

html-templates/confirm.tpl

@@ -12,9 +12,9 @@
         </div>
         <p class="confirm">{$question}</p>
         <form method="POST">
-            <button type="button" class="btn btn-default margin-right" name="Sure" value="No" onclick="javascript:history.go(-1);">No</button>
+            <button type="button" class="btn btn-secondary margin-right" name="Sure" value="No" onclick="javascript:history.go(-1);">No</button>
             <button type="submit" class="btn btn-danger" name="Sure">Yes</button>
         </form>
     </div>
 </div>
-{/block}
+{/block}

html-templates/designs/site.subtemplates.tpl

@@ -1,5 +1,4 @@
 {load_templates subtemplates/personName.tpl}
-{load_templates subtemplates/glyphicons.tpl}
 {load_templates subtemplates/icon.tpl}
 {load_templates subtemplates/timestamp.tpl}
 {load_templates subtemplates/people.tpl}

html-templates/events/event.tpl

@@ -15,7 +15,7 @@
         <div class="btn-toolbar pull-right">
             {if $.User}
                 <form action="{$Event->getUrl(edit)}">
-                    <button class="btn btn-success" type="submit">{glyph "pencil"}&nbsp;{_ "Edit Event&hellip;"}</button>
+                    <button class="btn btn-success" type="submit">{icon "pencil"}&nbsp;{_ "Edit Event&hellip;"}</button>
                 </form>
             {/if}
         </div>