1
0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-05 20:57:49 +02:00

Merge branch 'master'

This commit is contained in:
Awilum
2013-12-24 23:52:02 +02:00
7 changed files with 13 additions and 13 deletions

View File

@@ -1,12 +1,10 @@
# Monstra CMS # Monstra CMS
Fast and small content management system written in PHP! Monstra is a modern and lightweight Content Management System.
## System Requirements ## System Requirements
- UNIX/Linux host Operation system: Unix, Linux, Windows, Mac OS
- PHP 5.2.3 or higher Middleware: PHP 5.2.3 or higher with PHP's SimpleXML module and Multibyte String module
- SimpleXML Module Webserver: Apache with Mod Rewrite or Ngnix with Rewrite Module
- Apache Mod Rewrite
- Multibyte String
## Steps to Install ## Steps to Install
1. [Download the latest version.](http://monstra.org/download) 1. [Download the latest version.](http://monstra.org/download)

View File

@@ -111,7 +111,7 @@
</div> </div>
<div style="text-align:center"> <div style="text-align:center">
<span class="small-grey-text">© 2012 <a href="http://monstra.org" class="small-grey-text" target="_blank">Monstra</a> <?php echo __('Version', 'system'); ?> <?php echo Monstra::VERSION; ?></span> <span class="small-grey-text">© 2012 - 2014 <a href="http://monstra.org" class="small-grey-text" target="_blank">Monstra</a> <?php echo __('Version', 'system'); ?> <?php echo Monstra::VERSION; ?></span>
</div> </div>
</body> </body>

View File

@@ -128,7 +128,7 @@ class Javascript
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>'; echo '<script type="text/javascript" src="'.Option::get('siteurl').'tmp/minify/frontend_site.minify.js"></script>'."\n";
} }
} }
} }

View File

@@ -4,4 +4,4 @@
* Set meta generator * Set meta generator
*/ */
Action::add('theme_meta', 'setMetaGenerator'); Action::add('theme_meta', 'setMetaGenerator');
function setMetaGenerator() { echo '<meta name="generator" content="Powered by Monstra '.Monstra::VERSION.'" />'; } function setMetaGenerator() { echo '<meta name="generator" content="Powered by Monstra '.Monstra::VERSION.'" />'."\n"; }

View File

@@ -16,8 +16,11 @@
// Get array with the names of all modules compiled and loaded // Get array with the names of all modules compiled and loaded
$php_modules = get_loaded_extensions(); $php_modules = get_loaded_extensions();
// Get server port
if ($_SERVER["SERVER_PORT"] == "80") $port = ""; else $port = ':'.$_SERVER["SERVER_PORT"];
// Get site URL // Get site URL
$site_url = 'http://'.$_SERVER["SERVER_NAME"].str_replace(array("index.php", "install.php"), "", $_SERVER['PHP_SELF']); $site_url = 'http://'.$_SERVER["SERVER_NAME"].$port.str_replace(array("index.php", "install.php"), "", $_SERVER['PHP_SELF']);
// Rewrite base // Rewrite base
$rewrite_base = str_replace(array("index.php", "install.php"), "", $_SERVER['PHP_SELF']); $rewrite_base = str_replace(array("index.php", "install.php"), "", $_SERVER['PHP_SELF']);

View File

@@ -659,4 +659,3 @@ class Image
} }
} }
code

View File

@@ -20,4 +20,4 @@
</div> </div>
<hr> <hr>
<?php Chunk::get('footer'); <?php Chunk::get('footer'); ?>