mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-25 14:11:05 +02:00
Code Issues Releases Wiki Activity

Merge branch 'origin/dev'

Browse Source 
Conflicts:
	engine/Monstra.php
	public/assets/js/bootstrap.js
This commit is contained in:
Awilum
2014-01-01 21:32:20 +02:00
parent 83f80306d3 cd0d8296a5
commit 5ea80e31e0
20 changed files with 5290 additions and 3342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/box/filesmanager/languages/de.lang.php
View File

@@ -13,7 +13,7 @@
'Delete file: :file' => 'Lösche Datei: file',
'Extension' => 'Dateiendung',
'Size' => 'Größe',
'Select file' => 'Select file',
'Change' => 'Change',
'Select file' => 'Datei wählen',
'Change' => 'Ändern',
)
);

8
plugins/box/pages/pages.admin.php
View File

@@ -309,7 +309,13 @@ class PagesAdmin extends Backend
// Update parents in all childrens
if ((Security::safeName(Request::post('page_name'), '-', true)) !== (Security::safeName(Request::post('page_old_name'), '-', true)) and (Request::post('old_parent') == '')) {
$pages->updateWhere('[parent="'.Request::get('name').'"]', array('parent' => Text::translitIt(trim(Request::post('page_name')))));
$_pages = $pages->select('[parent="'.Text::translitIt(trim(Request::post('page_old_name'))).'"]');
if ( ! empty($_pages)) {
foreach ($_pages as $_page) {
$pages->updateWhere('[parent="'.$_page['parent'].'"]', array('parent' => Security::safeName(Request::post('page_name'), '-', true)));
}
}
if ($pages->updateWhere('[slug="'.Request::get('name').'"]',
array('slug' => Security::safeName(Request::post('page_name'), '-', true),

18
plugins/box/sitemap/views/frontend/index.view.php
View File

@@ -3,25 +3,27 @@
<ul>
<?php
// Display pages
if (count($pages_list) > 0) {
foreach ($pages_list as $page) {
if (trim($page['parent']) !== '') $parent = $page['parent'].'/'; else $parent = '';
if (trim($page['parent']) !== '') { echo '<ul>'; }
echo '<li><a href="'.Option::get('siteurl').$parent.$page['slug'].'">'.$page['title'].'</a></li>';
if (trim($page['parent']) !== '') { echo '</ul>'; }
if (trim($page['parent']) !== '') { echo '<ul>'."\n"; }
echo '<li><a href="'.Option::get('siteurl').$parent.$page['slug'].'">'.$page['title'].'</a></li>'."\n";
if (trim($page['parent']) !== '') { echo '</ul>'."\n"; }
}
if (count($components) == 0) { echo '<ul>'; }
if (count($components) == 0) { echo '<ul>'."\n"; }
}
// Display components
if (count($components) > 0) {
if (count($pages_list) == 0) { echo '<ul>'; }
if (count($pages_list) == 0) { echo '<ul>'."\n"; }
foreach ($components as $component) {
echo '<li><a href="'.Option::get('siteurl').$component.'">'.__(ucfirst($component), $component).'</a></li>';
echo '<li><a href="'.Option::get('siteurl').$component.'">'.__(ucfirst($component), $component).'</a></li>'."\n";
}
echo '</ul>';
if (count($pages_list) == 0) { echo '</ul>'."\n"; }
}
?>

2
plugins/box/users/languages/de.lang.php
View File

@@ -63,6 +63,6 @@
'Your login details for :site_name' => 'Deine Login-Daten für :site_name',
'About Me' => 'Über Mich',
'Profile' => 'Profil',
'You are banned for 10 minutes. Try again later' => 'You are banned for 10 minutes. Try again later',
'You are banned for 10 minutes. Try again later' => 'Du wurdest für 10 Minuten blockiert. Bitte probier es später nochmal',
)
);

4
plugins/box/users/views/emails/layout_email.view.php
View File

@@ -192,7 +192,9 @@
<table width="100%" cellpadding="10" cellspacing="0" border="0">
<tr>
<td valign="top" style="font-size:11px; border-top:1px dashed #ccc; text-align:right;">
<p style="margin-top:0; margin-bottom:0;">© 2012 - 2014 <a href="http://monstra.org" style="color:#333; text-decoration:none;">MONSTRA.ORG</p>
<p style="margin-top:0; margin-bottom:0;">
</p>
</td>
</tr>
</table>