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

Core Improvements: Next Round #79 #80

Browse Source
This commit is contained in:
Awilum
2013-01-08 23:16:41 +02:00
parent b4438b5440
commit 7552b2aee5
5 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
engine/Monstra.php
View File

@@ -154,6 +154,9 @@ class Monstra
// Shortcode API // Shortcode API
'Shortcode' => ROOT . DS .'engine'. DS .'Shortcode.php', 'Shortcode' => ROOT . DS .'engine'. DS .'Shortcode.php',
// Idiorm
'ORM' => ROOT . DS .'libraries'. DS . 'Idiorm'. DS .'ORM.php',
)); ));
/** /**
@@ -165,10 +168,9 @@ class Monstra
* Init Idiorm * Init Idiorm
*/ */
if (defined('MONSTRA_DB_DSN')) { if (defined('MONSTRA_DB_DSN')) {
require_once ROOT . DS . 'libraries'. DS .'Idiorm'. DS .'Idiorm.php'; ORM::configure(MONSTRA_DB_DSN);
Orm::configure(MONSTRA_DB_DSN); ORM::configure('username', MONSTRA_DB_USER);
Orm::configure('username', MONSTRA_DB_USER); ORM::configure('password', MONSTRA_DB_PASSWORD);
Orm::configure('password', MONSTRA_DB_PASSWORD);
} }
/** /**
@@ -227,7 +229,7 @@ class Monstra
/** /**
* Init site module * Init site module
*/ */
if( ! BACKEND) Site::init(); if ( ! BACKEND) Site::init();
} }
/** /**

2
libraries/Gelato/ErrorHandler/Resources/Views/Errors/exception.php
View File

@@ -28,7 +28,7 @@
#gelato-error td {font-size:14px;background:#fff;border-color: #ddd;border-width: 1px 1px 0 0;border-style: solid;margin: 0;padding: 4px;} #gelato-error td {font-size:14px;background:#fff;border-color: #ddd;border-width: 1px 1px 0 0;border-style: solid;margin: 0;padding: 4px;}
.pull-right {float: right;} .pull-right {float: right;}
</style> </style>
<body>
<div id="gelato-error"> <div id="gelato-error">
<div class="error"> <div class="error">

28
libraries/Gelato/ErrorHandler/Resources/Views/Errors/production.php
View File

@@ -4,8 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>Error</title> <title>Error</title>
<style type="text/css"> <style type="text/css">
body body {
{
height:100%; height:100%;
background:#eee; background:#eee;
padding:0px; padding:0px;
@@ -16,43 +15,30 @@ color:#333;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
line-height: 100%; line-height: 100%;
} }
a a {
{
color:#0088cc; color:#0088cc;
text-decoration:none; text-decoration:none;
} }
a:hover a:hover {
{
color:#005580; color:#005580;
text-decoration:underline; text-decoration:underline;
} }
h1 h1 {
{
font-size: 4em; font-size: 4em;
} }
small small {
{
font-size: 0.7em; font-size: 0.7em;
color: #999; color: #999;
font-weight: normal; font-weight: normal;
} }
hr hr {
{
border:0px; border:0px;
border-bottom:1px #ddd solid; border-bottom:1px #ddd solid;
} }
#message #message {
{
width: 700px; width: 700px;
margin: 15% auto; margin: 15% auto;
} }
#back-home
{
bottom:0px;
right:0px;
position:absolute;
padding:10px;
}
</style> </style>
</head> </head>
<body> <body>

2
libraries/Gelato/README.md
View File

@@ -6,4 +6,4 @@ Gelato is a PHP5 library for kickass Web Applications.
- [Site](http://gelato.monstra.org) - [Site](http://gelato.monstra.org)
- [Github Repository](https://github.com/Monstra/gelato-library) - [Github Repository](https://github.com/Monstra/gelato-library)
Copyright (C) 2013 Romanenko Sergey / Awilum [awilum@msn.com] Copyright (C) 2012-2013 Romanenko Sergey / Awilum [awilum@msn.com]

2
libraries/Idiorm/Idiorm.php → libraries/Idiorm/ORM.php
View File

@@ -38,7 +38,7 @@
* *
*/ */
class orm class ORM
{ {
// ----------------------- // // ----------------------- //
// --- CLASS CONSTANTS --- // // --- CLASS CONSTANTS --- //