Merge pull request #205 from EuanMead/dev

Numerous Improvements & Tweaks

admin/themes/default/index.template.php

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>Monstra :: <?php echo __('Administration', 'system'); ?></title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="Monstra admin area" />
+    <meta name="description" content="Monstra Admin Mrea" />
     <link rel="icon" href="<?php echo Option::get('siteurl'); ?>/favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="<?php echo Option::get('siteurl'); ?>/favicon.ico" type="image/x-icon" />
 
@@ -49,8 +49,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-      <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
+      <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7/html5shiv.js"></script>
+      <script src="//cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.js"></script>
     <![endif]-->
   </head>
 

plugins/box/themes/views/backend/add.view.php

@@ -40,7 +40,7 @@
 
     echo (
         Html::br(2).
-        Form::submit('add_file_and_exit', __('Save and Exit', 'themes'), array('class' => 'btn')).Html::nbsp(2).
-        Form::submit('add_file', __('Save', 'themes'), array('class' => 'btn')).
+        Form::submit('add_file_and_exit', __('Save and Exit', 'themes'), array('class' => 'btn btn-primary')).Html::nbsp(2).
+        Form::submit('add_file', __('Save', 'themes'), array('class' => 'btn btn-default')).
         Form::close()
     );

plugins/box/themes/views/backend/edit.view.php

@@ -48,8 +48,8 @@
     echo (
        Form::textarea('content', Html::toText($content), array('style' => 'width:100%;height:400px;', 'class' => 'source-editor')).
        Html::br(2).
-       Form::submit('edit_file_and_exit', __('Save and Exit', 'themes'), array('class' => 'btn')).Html::nbsp(2).
-       Form::submit('edit_file', __('Save', 'themes'), array('class' => 'btn')). Html::nbsp().
+       Form::submit('edit_file_and_exit', __('Save and Exit', 'themes'), array('class' => 'btn btn-primary')).Html::nbsp(2).
+       Form::submit('edit_file', __('Save', 'themes'), array('class' => 'btn btn-default')). Html::nbsp().
        Form::close()
     );
 

plugins/box/themes/views/backend/index.view.php

@@ -11,8 +11,8 @@
                 Form::open().
                 Form::hidden('csrf', Security::token()).
                 Form::label('themes', __('Select Theme', 'themes')).
-                Form::select('themes', $themes_site, $current_site_theme, array('class' => 'input-xlarge')). Html::br().
-                Form::submit('save_site_theme', __('Save', 'themes'), array('class' => 'btn')).
+                Form::select('themes', $themes_site, $current_site_theme, array('class' => 'form-control')). Html::br().
+                Form::submit('save_site_theme', __('Save', 'themes'), array('class' => 'btn btn-primary')).
                 Form::close()
             );
         ?>
@@ -31,8 +31,8 @@
                 Form::open().
                 Form::hidden('csrf', Security::token()).
                 Form::label('themes', __('Select Theme', 'themes')).
-                Form::select('themes', $themes_admin, $current_admin_theme, array('class' => 'input-xlarge')). Html::br().
-                Form::submit('save_admin_theme', __('Save', 'themes'), array('class' => 'btn')).
+                Form::select('themes', $themes_admin, $current_admin_theme, array('class' => 'form-control')). Html::br().
+                Form::submit('save_admin_theme', __('Save', 'themes'), array('class' => 'btn btn-primary')).
                 Form::close()
             );
         ?>
@@ -54,7 +54,7 @@
     );
 ?>
 
-<?php echo (Html::anchor(__('Create New Template', 'themes'), 'index.php?id=themes&action=add_template', array('title' => __('Create New Template'), 'class' => 'btn btn-small')).Html::br(2)); ?>
+<?php echo (Html::anchor(__('Create New Template', 'themes'), 'index.php?id=themes&action=add_template', array('title' => __('Create New Template'), 'class' => 'btn btn-default')).Html::br(2)); ?>
 
 <!-- Templates_list -->
 <table class="table table-bordered">
@@ -71,16 +71,16 @@
         <td>
             <div class="pull-right">
                 <div class="btn-group">
-                    <?php echo Html::anchor(__('Edit', 'themes'), 'index.php?id=themes&action=edit_template&filename='.basename($template, '.template.php'), array('class' => 'btn btn-small')); ?>
-                    <a class="btn dropdown-toggle btn-small" data-toggle="dropdown" href="#" style="font-family:arial;"><span class="caret"></span></a>
+                    <?php echo Html::anchor(__('Edit', 'themes'), 'index.php?id=themes&action=edit_template&filename='.basename($template, '.template.php'), array('class' => 'btn btn-primary')); ?>
+                    <a class="btn dropdown-toggle btn-primary" data-toggle="dropdown" href="#" style="font-family:arial;"><span class="caret"></span></a>
                     <ul class="dropdown-menu">
                         <li><?php echo Html::anchor(__('Clone', 'themes'), 'index.php?id=themes&action=clone_template&filename='.basename($template, '.template.php').'&token='.Security::token(), array('title' => __('Clone'))); ?></li>
                     </ul>
+                </div>
                     <?php echo Html::anchor(__('Delete', 'themes'),
                                'index.php?id=themes&action=delete_template&filename='.basename($template, '.template.php').'&token='.Security::token(),
-                               array('class' => 'btn btn-actions btn-small btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete template: :name', 'themes', array(':name' => basename($template, '.template.php')))."')"));
+                               array('class' => 'btn btn-actions btn-danger btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete template: :name', 'themes', array(':name' => basename($template, '.template.php')))."')"));
                     ?>
-                </div>
             </div>
         </td>
     </tr>
@@ -89,7 +89,7 @@
 </table>
 <!-- /Templates_list -->
 
-<?php echo (Html::anchor(__('Create New Chunk', 'themes'), 'index.php?id=themes&action=add_chunk', array('title' => __('Create New Chnuk', 'themes'), 'class' => 'btn btn-small')).Html::br(2)); ?>
+<?php echo (Html::anchor(__('Create New Chunk', 'themes'), 'index.php?id=themes&action=add_chunk', array('title' => __('Create New Chunk', 'themes'), 'class' => 'btn btn-default')).Html::br(2)); ?>
 
 <!-- Chunks_list -->
 <table class="table table-bordered">
@@ -106,16 +106,16 @@
         <td>
             <div class="pull-right">
                 <div class="btn-group">
-                    <?php echo Html::anchor(__('Edit', 'themes'), 'index.php?id=themes&action=edit_chunk&filename='.basename($chunk, '.chunk.php'), array('class' => 'btn btn-small')); ?>
-                    <a class="btn dropdown-toggle btn-small" data-toggle="dropdown" href="#" style="font-family:arial;"><span class="caret"></span></a>
+                    <?php echo Html::anchor(__('Edit', 'themes'), 'index.php?id=themes&action=edit_chunk&filename='.basename($chunk, '.chunk.php'), array('class' => 'btn btn-primary')); ?>
+                    <a class="btn dropdown-toggle btn-primary" data-toggle="dropdown" href="#" style="font-family:arial;"><span class="caret"></span></a>
                     <ul class="dropdown-menu">
                         <li><?php echo Html::anchor(__('Clone', 'themes'), 'index.php?id=themes&action=clone_chunk&filename='.basename($chunk, '.chunk.php').'&token='.Security::token(), array('title' => __('Clone', 'themes'))); ?></li>
                     </ul>
+				</div>
                     <?php echo Html::anchor(__('Delete', 'themes'),
                                'index.php?id=themes&action=delete_chunk&filename='.basename($chunk, '.chunk.php').'&token='.Security::token(),
-                               array('class' => 'btn btn-actions btn-small btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete chunk: :name', 'themes', array(':name' => basename($chunk, '.chunk.php')))."')"));
+                               array('class' => 'btn btn-actions btn-danger btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete chunk: :name', 'themes', array(':name' => basename($chunk, '.chunk.php')))."')"));
                     ?>
-                </div>
             </div>
         </td>
     </tr>
@@ -124,7 +124,7 @@
 </table>
 <!-- /Chunks_list -->
 
-<?php echo (Html::anchor(__('Create New Styles', 'themes'), 'index.php?id=themes&action=add_styles', array('title' => __('Create New Style', 'themes'), 'class' => 'btn btn-small')).Html::br(2)); ?>
+<?php echo (Html::anchor(__('Create New Styles', 'themes'), 'index.php?id=themes&action=add_styles', array('title' => __('Create New Style', 'themes'), 'class' => 'btn btn-default')).Html::br(2)); ?>
 
 <!-- Styles_list -->
 <table class="table table-bordered">
@@ -141,16 +141,16 @@
         <td>
             <div class="pull-right">
                 <div class="btn-group">
-                    <?php echo Html::anchor(__('Edit', 'themes'), 'index.php?id=themes&action=edit_styles&filename='.basename($style, '.css'), array('class' => 'btn btn-small')); ?>
-                    <a class="btn dropdown-toggle btn-small" data-toggle="dropdown" href="#" style="font-family:arial;"><span class="caret"></span></a>
+                    <?php echo Html::anchor(__('Edit', 'themes'), 'index.php?id=themes&action=edit_styles&filename='.basename($style, '.css'), array('class' => 'btn btn-primary')); ?>
+                    <a class="btn dropdown-toggle btn-primary" data-toggle="dropdown" href="#" style="font-family:arial;"><span class="caret"></span></a>
                     <ul class="dropdown-menu">
                         <li><?php echo Html::anchor(__('Clone', 'themes'), 'index.php?id=themes&action=clone_styles&filename='.basename($style, '.css').'&token='.Security::token(), array('title' => __('Clone', 'themes'))); ?></li>
                     </ul>
+				</div>
                     <?php echo Html::anchor(__('Delete', 'themes'),
                                'index.php?id=themes&action=delete_styles&filename='.basename($style, '.css').'&token='.Security::token(),
-                               array('class' => 'btn btn-actions btn-small btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete styles: :name', 'themes', array(':name' => basename($style, '.css')))."')"));
+                               array('class' => 'btn btn-actions btn-danger btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete styles: :name', 'themes', array(':name' => basename($style, '.css')))."')"));
                     ?>
-                </div>
             </div>
         </td>
     </tr>
@@ -159,7 +159,7 @@
 </table>
 <!-- /Styles_list -->
 
-<?php echo (Html::anchor(__('Create New Script', 'themes'), 'index.php?id=themes&action=add_script', array('title' => __('Create New Script', 'themes'), 'class' => 'btn btn-small')).Html::br(2)); ?>
+<?php echo (Html::anchor(__('Create New Script', 'themes'), 'index.php?id=themes&action=add_script', array('title' => __('Create New Script', 'themes'), 'class' => 'btn btn-default')).Html::br(2)); ?>
 
 <!-- Scripts_list -->
 <table class="table table-bordered">
@@ -176,16 +176,16 @@
         <td>
             <div class="pull-right">
                 <div class="btn-group">
-                    <?php echo Html::anchor(__('Edit', 'themes'), 'index.php?id=themes&action=edit_script&filename='.basename($script, '.js'), array('class' => 'btn btn-small')); ?>
-                    <a class="btn dropdown-toggle btn-small" data-toggle="dropdown" href="#" style="font-family:arial;"><span class="caret"></span></a>
+                    <?php echo Html::anchor(__('Edit', 'themes'), 'index.php?id=themes&action=edit_script&filename='.basename($script, '.js'), array('class' => 'btn btn-primary')); ?>
+                    <a class="btn dropdown-toggle btn-primary" data-toggle="dropdown" href="#" style="font-family:arial;"><span class="caret"></span></a>
                     <ul class="dropdown-menu">
                         <li><?php echo Html::anchor(__('Clone', 'themes'), 'index.php?id=themes&action=clone_script&filename='.basename($script, '.js').'&token='.Security::token(), array('title' => __('Clone', 'themes'))); ?></li>
                     </ul>
+                </div>
                     <?php echo Html::anchor(__('Delete', 'themes'),
                                'index.php?id=themes&action=delete_script&filename='.basename($script, '.js').'&token='.Security::token(),
-                               array('class' => 'btn btn-actions btn-small btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete script: :name', 'themes', array(':name' => basename($script, '.js')))."')"));
+                               array('class' => 'btn btn-actions btn-danger btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete script: :name', 'themes', array(':name' => basename($script, '.js')))."')"));
                     ?>
-                </div>
             </div>
         </td>
     </tr>

public/themes/default/css/default.css

@@ -29,7 +29,7 @@ body {
 .label,
 .input-group-addon,
 code {
-    border-radius: 0px;
+    border-radius: 0;
 }
 .badge,
 .label {

public/themes/default/header.chunk.php

@@ -26,12 +26,12 @@
 
     <?php Action::run('theme_header'); ?>
 
-    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
-      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+      <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7/html5shiv.js"></script>
     <![endif]-->
 
-    <!-- Fav icons -->
+    <!-- Fav-icons -->
     <link rel="icon" href="<?php echo Site::url(); ?>/favicon.ico" type="image/x-icon">
     <link rel="shortcut icon" href="<?php echo Site::url(); ?>/favicon.ico" type="image/x-icon">
   </head>