Merge branch 'dev' of https://github.com/Awilum/monstra-cms into dev

2025-08-04 04:07:59 +02:00 · 2014-02-14 17:21:28 +02:00
parent 7ca3946f8a 80582f2c9f
commit f7bc03ef91
12 changed files with 154 additions and 46 deletions
--- a/admin/themes/default/css/default.css
+++ b/admin/themes/default/css/default.css
@@ -49,6 +49,13 @@ a.btn-expand {
    padding-right:4px;
 }

+.btn:active,
+.btn.active {
+  background-image: none;
+  outline: 0;
+  box-shadow: none;
+}
+
 .login-footer, 
 .login-footer a {
    color:#777;
@@ -472,6 +479,20 @@ td, th {
    border: none;
 }

+.modal-header .close:hover {
+    background: #D3D3D3;
+}
+
+.modal-header .close {
+    text-shadow:none;
+    background: #DCDCDC;
+    width: 1.0em;
+    height: 1.0em;
+    text-align: center;
+    font-weight: 900;
+    cursor: pointer;
+}
+
 #readme .modal-dialog {
    width: 70%;
 }
--- a/plugins/box/backup/views/backend/index.view.php
+++ b/plugins/box/backup/views/backend/index.view.php
@@ -1,11 +1,11 @@
-<h2><?php echo __('Backups', 'backup'); ?></h2>
-<br>
-
-<script>
-$().ready(function(){$('[name=create_backup]').click(function(){$(this).button('loading');});});
-</script>
+<script>$().ready(function(){$('[name=create_backup]').click(function(){$(this).button('loading');});});</script>

 <div>
+    <div class="pull-left">
+        <h2><?php echo __('Backups', 'backup'); ?></h2>
+    </div>
+    <div class="pull-right">
+        <br>
        <?php
            echo (
                Form::open(null, array('class' => 'form-inline')) .
@@ -15,6 +15,8 @@ $().ready(function(){$('[name=create_backup]').click(function(){$(this).button('
            );
        ?>
    </div>
+    <div class="clearfix"></div>
+</div>

 <br>

--- a/plugins/box/blocks/views/backend/index.view.php
+++ b/plugins/box/blocks/views/backend/index.view.php
@@ -55,7 +55,7 @@
    <div class="modal-dialog">
        <div class="modal-content">
            <div class="modal-header">
-                <a class="close" data-dismiss="modal">&times;</a>
+                <div class="close" data-dismiss="modal">&times;</div>
                <h4 class="modal-title"><?php echo __('Embed Code', 'snippets'); ?></h4>
            </div>
            <div class="modal-body">
--- a/plugins/box/filesmanager/views/backend/index.view.php
+++ b/plugins/box/filesmanager/views/backend/index.view.php
@@ -141,7 +141,7 @@
  <div class="modal-dialog">
    <div class="modal-content">
      <div class="modal-header">
-        <a class="close" data-dismiss="modal">&times;</a>
+        <div class="close" data-dismiss="modal">&times;</div>
        <h4 class="modal-title" id="myModalLabel"><?php echo __('Create New Directory', 'filesmanager'); ?></h4>
      </div>
      <form role="form" method="POST">
@@ -164,7 +164,7 @@
  <div class="modal-dialog">
    <div class="modal-content">
      <div class="modal-header">
-        <a class="close" data-dismiss="modal">&times;</a>
+        <div class="close" data-dismiss="modal">&times;</div>
        <h4 class="modal-title"><?php echo __('Rename', 'filesmanager'); ?></h4>
      </div>
      <form role="form" method="POST">
--- a/plugins/box/menu/views/backend/add.view.php
+++ b/plugins/box/menu/views/backend/add.view.php
@@ -68,7 +68,7 @@
    <div class="modal-dialog">
        <div class="modal-content">
            <div class="modal-header">
-                <a class="close" data-dismiss="modal">&times;</a>
+                <div class="close" data-dismiss="modal">&times;</div>
                <h4 class="modal-title"><?php echo __('Select page', 'menu'); ?></h4>
            </div>
            <div class="modal-body">
--- a/plugins/box/menu/views/backend/edit.view.php
+++ b/plugins/box/menu/views/backend/edit.view.php
@@ -69,7 +69,7 @@
    <div class="modal-dialog">
        <div class="modal-content">
            <div class="modal-header">
-                <a class="close" data-dismiss="modal">×</a>
+                <div class="close" data-dismiss="modal">&times;</div>
                <h4 class="modal-title"><?php echo __('Select page', 'menu'); ?></h4>
            </div>
            <div class="modal-body">
@@ -90,7 +90,7 @@
    <div class="modal-dialog">
        <div class="modal-content">
            <div class="modal-header">
-                <a class="close" data-dismiss="modal">×</a>
+                <div class="close" data-dismiss="modal">&times;</div>
                <h4 class="modal-title"><?php echo __('Select category', 'menu'); ?></h4>
            </div>
            <div class="modal-body">
--- a/plugins/box/plugins/views/backend/index.view.php
+++ b/plugins/box/plugins/views/backend/index.view.php
@@ -110,16 +110,15 @@
                        Form::hidden('csrf', Security::token())
                    );
                ?>
-                <div class="fileupload fileupload-new fileupload-controls" data-provides="fileupload">
-                    <button class="btn btn-default btn-file"><span class="fileupload-new"><?php echo __('Select file', 'plugins'); ?></span><span class="fileupload-exists"><?php echo __('Change', 'plugins'); ?></span><input type="file" name="file" /></button>
+                <div class="fileinput fileinput-new pull-left" data-provides="fileinput">
+                    <span class="btn btn-default btn-file"><span class="fileinput-new"><?php echo __('Select file', 'filesmanager'); ?></span><span class="fileinput-exists"><?php echo __('Change', 'filesmanager'); ?></span><input type="file" name="file"></span>
                        <?php
                            echo (
                                Form::submit('upload_file', __('Upload', 'plugins'), array('class' => 'btn btn-primary')).
                                Form::close()
                            );
                        ?>
-                    <span class="fileupload-preview"></span>
-
+                    <span class="fileinput-filename"></span>
                </div>
 				<div id="DgDfileUploader">
 					<div class="upload-area">
@@ -159,7 +158,7 @@
  <div class="modal-dialog">
    <div class="modal-content">
      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <div class="close" data-dismiss="modal">&times;</div>
        <h4 class="modal-title" id="myModalLabel">README.md</h4>
      </div>
      <div class="modal-body"></div>
--- a/public/themes/default/blog-post.template.php
+++ b/public/themes/default/blog-post.template.php
@@ -9,11 +9,10 @@

        <div class="row">
            <div class="col-xs-12">
-                <h3 class="monstra-blog-title"><?php echo Blog::getPostTitle(); ?></h3>
-                <small class="monstra-blog-date"><?php echo Blog::getPostDate('d M Y'); ?> / <?php echo Blog::getPostAuthor(); ?></small>
                <div class="monstra-blog-post">
                    <?php echo Blog::getPost(); ?>
                </div>
+                <small class="monstra-blog-date"><?php echo Blog::getPostDate('d M Y'); ?> / <?php echo Blog::getPostAuthor(); ?></small>
            </div>
        </div>

--- a/public/themes/default/blog.template.php
+++ b/public/themes/default/blog.template.php
@@ -11,7 +11,7 @@
            <div class="col-xs-8">
                <?php echo Blog::getPosts(3); ?>
            </div>
-            <div class="col-xs-4">
+            <div class="col-xs-4 tags">
                <h3>Tags</h3>
                <?php echo Blog::getTags(); ?>
            </div>
--- a/public/themes/default/css/default.css
+++ b/public/themes/default/css/default.css
@@ -1,19 +1,15 @@
 body {
-    padding-top: 60px;
-    padding-bottom: 40px;
+    
 }

-.user-panel {
-    margin-top: 16px;
+a {
+    color: #4169E1;
+    text-decoration: none;
 }

-.user-panel {
-	color: #fff;
-}
-
-.user-panel a {
-	color: #fff;
-	text-decoration: underline;
+a:hover {
+    color: #DC143C;
+    text-decoration: none;
 }

 .error {
@@ -54,3 +50,80 @@ code {
 a.monstra-blog-tag {
    text-decoration: none;
 }
+
+.masthead {
+    background: -webkit-linear-gradient(45deg, #412e4c, #a56365, #b39c68);
+    background: -moz-linear-gradient(45deg, #412e4c, #a56365, #b39c68);
+    background: -o-linear-gradient(45deg, #412e4c, #a56365, #b39c68);
+    background: linear-gradient(45deg, #412e4c, #a56365, #b39c68);
+}
+
+.navbar {
+    border: 0;
+    border-radius: 0;
+    margin-bottom: 0;
+    background-color: transparent;
+    background-color: #fff;
+}
+
+.navbar-nav a {
+    color: #696969;
+}
+
+.navbar-nav > li > a:hover {
+    background: transparent;
+    color: #000;
+}
+
+.navbar-nav a:hover {
+    color: #000;
+    background: transparent;
+}
+
+.navbar-nav > li.active > a {
+    background: transparent;
+    color: #000;
+}
+
+a.navbar-brand {
+    color: #000;
+    font-size: 36px;
+}
+
+.navbar .container {
+    margin-bottom: 20px;
+    margin-top: 20px;
+}
+
+.page-header {
+    color: #fff;
+    border:none;
+    margin-right: auto;
+    margin-left: auto;
+    margin-top: 0px;
+    margin-bottom: 0px;
+    border-bottom: none;
+    padding-bottom: 0px;
+    padding-top: 0px;
+}
+
+.page-header h1 {
+    font-size: 40px;
+    text-align: left;
+    margin-bottom: 20px;
+    margin-top: 20px;
+}
+
+.tags .label {
+    font-size: 14px;
+}
+
+.container {
+    margin-bottom: 10px;
+    margin-top: 10px;
+}
+
+footer {
+    padding-bottom: 40px;
+    color: #aaa;
+}
--- a/public/themes/default/footer.chunk.php
+++ b/public/themes/default/footer.chunk.php
@@ -1,6 +1,6 @@
        <footer>
-                <div style="float:left;"><?php echo Chunk::get('footer-links'); ?></div>
-                <div style="float:right;"><?php Action::run('theme_footer'); ?><?php echo Site::powered(); ?></div>
+                <div class="pull-left"><?php echo Chunk::get('footer-links'); ?></div>
+                <div class="pull-right"><?php Action::run('theme_footer'); ?><?php echo Site::powered(); ?></div>
        </footer>

    </div> <!-- /container -->
--- a/public/themes/default/header.chunk.php
+++ b/public/themes/default/header.chunk.php
@@ -47,7 +47,9 @@

  <body>

-    <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+  <div class="masthead">
+
+    <div class="navbar" role="navigation">
      <div class="container">
        <div class="navbar-header">
          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
@@ -59,12 +61,24 @@
          <a class="navbar-brand" href="<?php echo Site::url(); ?>"><?php echo Site::name(); ?></a>
        </div>
        <div class="collapse navbar-collapse">
-          <ul class="nav navbar-nav">
+          <ul class="nav navbar-nav pull-right">
              <?php echo Menu::get(); ?>
          </ul>
-          <div class="pull-right user-panel">
+          <!--<div class="pull-right user-panel">
            <?php Users::getPanel(); ?>
+          </div>-->
        </div>
      </div>
    </div>
+
+    <div class="page-header container text-center">
+      <?php if (Uri::segment(0) == 'users') { ?>
+        <h1><?php echo __('Users', 'users'); ?></h1>
+      <?php } elseif (Uri::segment(0) == 'sitemap') { ?>
+        <h1><?php echo __('Sitemap', 'sitemap'); ?></h1>
+      <?php } else { ?>
+        <h1><?php echo Page::title(); ?></h1>
+      <?php } ?>
+    </div>
+
  </div>