mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-03 19:57:57 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
metal_gvc
2014-02-14 17:21:28 +02:00
parent 7ca3946f8a 80582f2c9f
commit f7bc03ef91
12 changed files with 154 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
admin/themes/default/css/default.css
View File

@@ -49,6 +49,13 @@ a.btn-expand {
padding-right:4px; padding-right:4px;
} }
.btn:active,
.btn.active {
background-image: none;
outline: 0;
box-shadow: none;
}
.login-footer, .login-footer,
.login-footer a { .login-footer a {
color:#777; color:#777;
@@ -472,6 +479,20 @@ td, th {
border: none; 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 { #readme .modal-dialog {
width: 70%; width: 70%;
} }

30
plugins/box/backup/views/backend/index.view.php
View File

@@ -1,19 +1,21 @@
<h2><?php echo __('Backups', 'backup'); ?></h2> <script>$().ready(function(){$('[name=create_backup]').click(function(){$(this).button('loading');});});</script>
<br>
<script>
$().ready(function(){$('[name=create_backup]').click(function(){$(this).button('loading');});});
</script>
<div> <div>
<?php <div class="pull-left">
echo ( <h2><?php echo __('Backups', 'backup'); ?></h2>
Form::open(null, array('class' => 'form-inline')) . </div>
Form::hidden('csrf', Security::token()). <div class="pull-right">
Form::submit('create_backup', __('Create Backup', 'backup'), array('class' => 'btn btn-primary', 'data-loading-text' => __('Creating...', 'backup'))). <br>
Form::close() <?php
); echo (
?> Form::open(null, array('class' => 'form-inline')) .
Form::hidden('csrf', Security::token()).
Form::submit('create_backup', __('Create Backup', 'backup'), array('class' => 'btn btn-primary', 'data-loading-text' => __('Creating...', 'backup'))).
Form::close()
);
?>
</div>
<div class="clearfix"></div>
</div> </div>
<br> <br>

2
plugins/box/blocks/views/backend/index.view.php
View File

@@ -55,7 +55,7 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <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> <h4 class="modal-title"><?php echo __('Embed Code', 'snippets'); ?></h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">

4
plugins/box/filesmanager/views/backend/index.view.php
View File

@@ -141,7 +141,7 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <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> <h4 class="modal-title" id="myModalLabel"><?php echo __('Create New Directory', 'filesmanager'); ?></h4>
</div> </div>
<form role="form" method="POST"> <form role="form" method="POST">
@@ -164,7 +164,7 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <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> <h4 class="modal-title"><?php echo __('Rename', 'filesmanager'); ?></h4>
</div> </div>
<form role="form" method="POST"> <form role="form" method="POST">

2
plugins/box/menu/views/backend/add.view.php
View File

@@ -68,7 +68,7 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <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> <h4 class="modal-title"><?php echo __('Select page', 'menu'); ?></h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">

4
plugins/box/menu/views/backend/edit.view.php
View File

@@ -69,7 +69,7 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <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> <h4 class="modal-title"><?php echo __('Select page', 'menu'); ?></h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
@@ -90,7 +90,7 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <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> <h4 class="modal-title"><?php echo __('Select category', 'menu'); ?></h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">

9
plugins/box/plugins/views/backend/index.view.php
View File

@@ -110,16 +110,15 @@
Form::hidden('csrf', Security::token()) Form::hidden('csrf', Security::token())
); );
?> ?>
<div class="fileupload fileupload-new fileupload-controls" data-provides="fileupload"> <div class="fileinput fileinput-new pull-left" data-provides="fileinput">
<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> <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 <?php
echo ( echo (
Form::submit('upload_file', __('Upload', 'plugins'), array('class' => 'btn btn-primary')). Form::submit('upload_file', __('Upload', 'plugins'), array('class' => 'btn btn-primary')).
Form::close() Form::close()
); );
?> ?>
<span class="fileupload-preview"></span> <span class="fileinput-filename"></span>
</div> </div>
<div id="DgDfileUploader"> <div id="DgDfileUploader">
<div class="upload-area"> <div class="upload-area">
@@ -159,7 +158,7 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <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> <h4 class="modal-title" id="myModalLabel">README.md</h4>
</div> </div>
<div class="modal-body"></div> <div class="modal-body"></div>

3
public/themes/default/blog-post.template.php
View File

@@ -9,11 +9,10 @@
<div class="row"> <div class="row">
<div class="col-xs-12"> <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"> <div class="monstra-blog-post">
<?php echo Blog::getPost(); ?> <?php echo Blog::getPost(); ?>
</div> </div>
<small class="monstra-blog-date"><?php echo Blog::getPostDate('d M Y'); ?> / <?php echo Blog::getPostAuthor(); ?></small>
</div> </div>
</div> </div>

2
public/themes/default/blog.template.php
View File

@@ -11,7 +11,7 @@
<div class="col-xs-8"> <div class="col-xs-8">
<?php echo Blog::getPosts(3); ?> <?php echo Blog::getPosts(3); ?>
</div> </div>
<div class="col-xs-4"> <div class="col-xs-4 tags">
<h3>Tags</h3> <h3>Tags</h3>
<?php echo Blog::getTags(); ?> <?php echo Blog::getTags(); ?>
</div> </div>

97
public/themes/default/css/default.css
View File

@@ -1,19 +1,15 @@
body { body {
padding-top: 60px;
padding-bottom: 40px;
} }
.user-panel { a {
margin-top: 16px; color: #4169E1;
text-decoration: none;
} }
.user-panel { a:hover {
color: #fff; color: #DC143C;
} text-decoration: none;
.user-panel a {
color: #fff;
text-decoration: underline;
} }
.error { .error {
@@ -53,4 +49,81 @@ code {
a.monstra-blog-tag { a.monstra-blog-tag {
text-decoration: none; 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;
}

4
public/themes/default/footer.chunk.php
View File

@@ -1,6 +1,6 @@
<footer> <footer>
<div style="float:left;"><?php echo Chunk::get('footer-links'); ?></div> <div class="pull-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-right"><?php Action::run('theme_footer'); ?><?php echo Site::powered(); ?></div>
</footer> </footer>
</div> <!-- /container --> </div> <!-- /container -->

22
public/themes/default/header.chunk.php
View File

@@ -47,7 +47,9 @@
<body> <body>
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <div class="masthead">
<div class="navbar" role="navigation">
<div class="container"> <div class="container">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <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> <a class="navbar-brand" href="<?php echo Site::url(); ?>"><?php echo Site::name(); ?></a>
</div> </div>
<div class="collapse navbar-collapse"> <div class="collapse navbar-collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav pull-right">
<?php echo Menu::get(); ?> <?php echo Menu::get(); ?>
</ul> </ul>
<div class="pull-right user-panel"> <!--<div class="pull-right user-panel">
<?php Users::getPanel(); ?> <?php Users::getPanel(); ?>
</div> </div>-->
</div> </div>
</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>