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

Site Url without trailing slashes

Browse Source
This commit is contained in:
Awilum
2014-01-03 18:39:03 +02:00
parent c3fe4d16bc
commit 9da99040e1
5 changed files with 69 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,11 +4,7 @@ styles.css
*************************************
CONTENTS
1. GENERAL
2. HEADER
3. CONTENT
4. LEFT MENU
5. AUTHORIZATION
6. MEDIA QUERIES
2. MEDIA QUERIES
*************************************
1. GENERAL
@@ -48,7 +44,7 @@ td, th {
border-radius: 0px;
}
.nav-tabs>li>a {
.nav-tabs > li > a {
border-radius: 0px;
}
@@ -69,66 +65,74 @@ code {
.badge,
.label {
font-weight: normal;
text-shadow:none;
text-shadow: none;
}
/* Tabs */
.datapicker {
width: 200px;
}
.tab-pane > table {
.breadcrumb {
background: #fff;
border-radius: 0px;
}
/* Tabs */
.tab-pane > table {
margin-top:-20px;
}
}
.tab-pane > table {
.tab-pane > table {
border-top:none!important;
}
}
.tab-content {
.tab-content {
overflow: visible;
}
}
.tab-page {
.tab-page {
border-bottom: 1px solid #DDDDDD;
border-left: 1px solid #DDDDDD;
border-right: 1px solid #DDDDDD;
padding: 20px 10px 10px;
}
}
.small-grey-text {
.small-grey-text {
color:#333;
font-size: 10px;
}
}
.small-grey-text:hover {
.small-grey-text:hover {
color:#000;
}
}
.small-white-text {
.small-white-text {
color:#fff;
font-size: 10px;
}
}
.small-white-text:hover {
.small-white-text:hover {
color:#fdfdfd;
}
}
.error-none {display:none;}
.error-field {border:1px solid red!important;}
.container-fluid {padding-left:0px;}
img {max-width:none;}
.error-none {display:none;}
.error-field {border:1px solid red!important;}
.container-fluid {padding-left:0px;}
img {max-width:none;}
a.btn-expand{
a.btn-expand{
color: #333;
font-weight:bold;
font-size:14px;
text-decoration: none;
padding-left:4px;
padding-right:4px;
}
}
footer a , footer{
footer a , footer{
color:#333;
font-size:10px;
}
}
/* Inputs */
@@ -285,8 +289,3 @@ td, th {
footer {
margin-top: 40px;
}
.datapicker {
width: 200px;
}

12
admin/themes/default/index.template.php
View File

@@ -9,18 +9,18 @@
<link rel="shortcut icon" href="<?php echo Option::get('siteurl'); ?>favicon.ico" type="image/x-icon" />
<!-- Styles -->
<link rel="stylesheet" href="<?php echo Site::url(); ?>public/assets/css/bootstrap.css" type="text/css" />
<link rel="stylesheet" href="<?php echo Site::url(); ?>public/assets/css/messenger.css" type="text/css" />
<link rel="stylesheet" href="<?php echo Site::url(); ?>public/assets/css/messenger-theme-flat.css" type="text/css" />
<link rel="stylesheet" href="<?php echo Site::url(); ?>/public/assets/css/bootstrap.css" type="text/css" />
<link rel="stylesheet" href="<?php echo Site::url(); ?>/public/assets/css/messenger.css" type="text/css" />
<link rel="stylesheet" href="<?php echo Site::url(); ?>/public/assets/css/messenger-theme-flat.css" type="text/css" />
<?php Stylesheet::add('public/assets/css/chocolat.css', 'backend', 2); ?>
<?php Stylesheet::add('public/assets/css/bootstrap-fileupload.css', 'backend', 3); ?>
<?php Stylesheet::add('admin/themes/default/css/default.css', 'backend', 5); ?>
<?php Stylesheet::load(); ?>
<!-- JavaScripts -->
<script src="<?php echo Site::url(); ?>public/assets/js/jquery.min.js"></script>
<script src="<?php echo Site::url(); ?>public/assets/js/bootstrap.min.js"></script>
<script src="<?php echo Site::url(); ?>public/assets/js/messenger.min.js"></script>
<script src="<?php echo Site::url(); ?>/public/assets/js/jquery.min.js"></script>
<script src="<?php echo Site::url(); ?>/public/assets/js/bootstrap.min.js"></script>
<script src="<?php echo Site::url(); ?>/public/assets/js/messenger.min.js"></script>
<?php Javascript::add('public/assets/js/jquery.chocolat.js', 'backend', 3); ?>
<?php Javascript::add('public/assets/js/bootstrap-fileupload.js', 'backend', 4); ?>

4
engine/Plugin/Javascript.php
View File

@@ -126,9 +126,9 @@ class Javascript
// Render
if (BACKEND) {
echo '<script type="text/javascript" src="'.Option::get('siteurl').'tmp/minify/backend_site.minify.js"></script>';
echo '<script type="text/javascript" src="'.Option::get('siteurl').'/tmp/minify/backend_site.minify.js"></script>';
} else {
echo '<script type="text/javascript" src="'.Option::get('siteurl').'tmp/minify/frontend_site.minify.js"></script>'."\n";
echo '<script type="text/javascript" src="'.Option::get('siteurl').'/tmp/minify/frontend_site.minify.js"></script>'."\n";
}
}
}

8
engine/Plugin/Stylesheet.php
View File

@@ -128,9 +128,9 @@ class Stylesheet
// Render
if (BACKEND) {
echo '<link rel="stylesheet" href="'.Option::get('siteurl').'tmp/minify/backend_site.minify.css'.'" type="text/css" />';
echo '<link rel="stylesheet" href="'.Option::get('siteurl').'/tmp/minify/backend_site.minify.css'.'" type="text/css" />';
} else {
echo '<link rel="stylesheet" href="'.Option::get('siteurl').'tmp/minify/frontend_site.minify.css'.'" type="text/css" />'."\n";
echo '<link rel="stylesheet" href="'.Option::get('siteurl').'/tmp/minify/frontend_site.minify.css'.'" type="text/css" />'."\n";
}
}
}
@@ -144,8 +144,8 @@ class Stylesheet
'@theme_site_url',
'@theme_admin_url'),
array(Option::get('siteurl'),
Option::get('siteurl').'public/themes/'.Option::get('theme_site_name'),
Option::get('siteurl').'admin/themes/'.Option::get('theme_admin_name')),
Option::get('siteurl').'/public/themes/'.Option::get('theme_site_name'),
Option::get('siteurl').'/admin/themes/'.Option::get('theme_admin_name')),
$frontend_buffer);
}

3
plugins/box/system/system.admin.php
View File

@@ -121,9 +121,6 @@ class SystemAdmin extends Backend
// Add trailing slashes
$_site_url = Request::post('system_url');
if ($_site_url[strlen($_site_url)-1] !== '/') {
$_site_url = $_site_url.'/';
}
Option::update(array('sitename' => Request::post('site_name'),
'keywords' => Request::post('site_keywords'),