mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-07-31 18:30:20 +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

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

@@ -4,11 +4,7 @@ styles.css
************************************* *************************************
CONTENTS CONTENTS
1. GENERAL 1. GENERAL
2. HEADER 2. MEDIA QUERIES
3. CONTENT
4. LEFT MENU
5. AUTHORIZATION
6. MEDIA QUERIES
************************************* *************************************
1. GENERAL 1. GENERAL
@@ -24,19 +20,19 @@ styles.css
} }
body { body {
background: #FAFAFA; background: #FAFAFA;
} }
.navbar-inverse { .navbar-inverse {
background: #252525; background: #252525;
} }
.navbar-brand { .navbar-brand {
font-size: 24px; font-size: 24px;
} }
h1,h2,h3,h4,h5 { h1,h2,h3,h4,h5 {
color: #222; color: #222;
} }
td, th { td, th {
@@ -45,15 +41,15 @@ td, th {
} }
.navbar-default { .navbar-default {
border-radius: 0px; border-radius: 0px;
} }
.nav-tabs>li>a { .nav-tabs > li > a {
border-radius: 0px; border-radius: 0px;
} }
.tab-page { .tab-page {
background: #fff; background: #fff;
} }
.form-control, .form-control,
@@ -68,67 +64,75 @@ code {
} }
.badge, .badge,
.label { .label {
font-weight: normal; font-weight: normal;
text-shadow:none; text-shadow: none;
} }
/* Tabs */ .datapicker {
width: 200px;
}
.tab-pane > table { .breadcrumb {
margin-top:-20px; background: #fff;
} border-radius: 0px;
}
.tab-pane > table { /* Tabs */
border-top:none!important; .tab-pane > table {
} margin-top:-20px;
}
.tab-content { .tab-pane > table {
border-top:none!important;
}
.tab-content {
overflow: visible; overflow: visible;
} }
.tab-page { .tab-page {
border-bottom: 1px solid #DDDDDD; border-bottom: 1px solid #DDDDDD;
border-left: 1px solid #DDDDDD; border-left: 1px solid #DDDDDD;
border-right: 1px solid #DDDDDD; border-right: 1px solid #DDDDDD;
padding: 20px 10px 10px; padding: 20px 10px 10px;
} }
.small-grey-text { .small-grey-text {
color:#333; color:#333;
font-size: 10px; font-size: 10px;
} }
.small-grey-text:hover { .small-grey-text:hover {
color:#000; color:#000;
} }
.small-white-text { .small-white-text {
color:#fff; color:#fff;
font-size: 10px; font-size: 10px;
} }
.small-white-text:hover { .small-white-text:hover {
color:#fdfdfd; color:#fdfdfd;
} }
.error-none {display:none;} .error-none {display:none;}
.error-field {border:1px solid red!important;} .error-field {border:1px solid red!important;}
.container-fluid {padding-left:0px;} .container-fluid {padding-left:0px;}
img {max-width:none;} img {max-width:none;}
a.btn-expand{ a.btn-expand{
color: #333; color: #333;
font-weight:bold; font-weight:bold;
font-size:14px; font-size:14px;
text-decoration: none; text-decoration: none;
padding-left:4px; padding-left:4px;
padding-right:4px; padding-right:4px;
} }
footer a , footer{ footer a , footer{
color:#333; color:#333;
font-size:10px; font-size:10px;
} }
/* Inputs */ /* Inputs */
@@ -283,10 +287,5 @@ td, th {
} }
footer { footer {
margin-top: 40px; 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" /> <link rel="shortcut icon" href="<?php echo Option::get('siteurl'); ?>favicon.ico" type="image/x-icon" />
<!-- Styles --> <!-- 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/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.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/messenger-theme-flat.css" type="text/css" />
<?php Stylesheet::add('public/assets/css/chocolat.css', 'backend', 2); ?> <?php Stylesheet::add('public/assets/css/chocolat.css', 'backend', 2); ?>
<?php Stylesheet::add('public/assets/css/bootstrap-fileupload.css', 'backend', 3); ?> <?php Stylesheet::add('public/assets/css/bootstrap-fileupload.css', 'backend', 3); ?>
<?php Stylesheet::add('admin/themes/default/css/default.css', 'backend', 5); ?> <?php Stylesheet::add('admin/themes/default/css/default.css', 'backend', 5); ?>
<?php Stylesheet::load(); ?> <?php Stylesheet::load(); ?>
<!-- JavaScripts --> <!-- JavaScripts -->
<script src="<?php echo Site::url(); ?>public/assets/js/jquery.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/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/messenger.min.js"></script>
<?php Javascript::add('public/assets/js/jquery.chocolat.js', 'backend', 3); ?> <?php Javascript::add('public/assets/js/jquery.chocolat.js', 'backend', 3); ?>
<?php Javascript::add('public/assets/js/bootstrap-fileupload.js', 'backend', 4); ?> <?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 // Render
if (BACKEND) { 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 { } 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 // Render
if (BACKEND) { 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 { } 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_site_url',
'@theme_admin_url'), '@theme_admin_url'),
array(Option::get('siteurl'), array(Option::get('siteurl'),
Option::get('siteurl').'public/themes/'.Option::get('theme_site_name'), Option::get('siteurl').'/public/themes/'.Option::get('theme_site_name'),
Option::get('siteurl').'admin/themes/'.Option::get('theme_admin_name')), Option::get('siteurl').'/admin/themes/'.Option::get('theme_admin_name')),
$frontend_buffer); $frontend_buffer);
} }

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

@@ -121,9 +121,6 @@ class SystemAdmin extends Backend
// Add trailing slashes // Add trailing slashes
$_site_url = Request::post('system_url'); $_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'), Option::update(array('sitename' => Request::post('site_name'),
'keywords' => Request::post('site_keywords'), 'keywords' => Request::post('site_keywords'),