From 3d2376402ed4277afdbe9c4a54a5d59b09ce0ba0 Mon Sep 17 00:00:00 2001 From: Mark Hoschek Date: Fri, 11 Oct 2013 10:50:46 +0200 Subject: [PATCH] some minor fixes --- cms/data/content.sqlite | Bin 327680 -> 327680 bytes cms/data/userdata.sqlite | Bin 4096 -> 4096 bytes cms/index.php | 2 +- .../admin/subtemplates/admin_index.inc.tpl | 7 +++++++ .../admin/subtemplates/admin_menu.inc.tpl | 4 ++++ cms/templates/admin/subtemplates/edit.inc.tpl | 14 +++++++------- cms/templates/default.tpl | 2 +- index.php | 2 +- static/css/style.css | 2 +- 9 files changed, 22 insertions(+), 11 deletions(-) diff --git a/cms/data/content.sqlite b/cms/data/content.sqlite index a870a75faee87824f8b01d02164aadd168574939..73e42c6152722557bb5a35ceb42e60edf4beda61 100644 GIT binary patch delta 921 zcmZ{iO-$546oA|Egn}t6vXSVnFoFsQyDJb`Le?H!eij5IfO1mkc8A?!+iCg(LSkSM zym$~|%p}IBBwjozA*3cAym~ZI6Qc2G^rYTBXm^Jd!bn>TNM-akL@UkDpV(WF znC@mfAH-jsyBGT!?c!V4vK-H?nDk{4oa7$1(9cCs&222Y`+0a$=r>I1nqq~nI=W@6 zIEnRe3e&6r{<&Nno&OV$MI;f0kYUZp8KRQ3V#yhd2J@ezx=ux(#j2gbrer9%5e-U` zxigCsNzN#Gx)F6rnxZOLPkI||Cl?uZ3~Wv*mO}J;r0A&2#7fdJ)AU#x0`yrifcv}@ z+Ss`l_;?#rTO1I8hvHfx-)ecU1*-DzHG;5kLEwdtmwAD|+vGh2Z?HVWGbtiF8rE&e z_9!VlAvvl&H1xiFXmsOn$6sr^CmJzvI2_g_MIX~JeM+E|eyfB>?%Q6-RJdXic$PXL zIO1NE;WX^y7=~|I%SL$jyANuD?Kgb&QKo-OxI6DywwG|$)BN4HeQA{p$hR#za@HCe zU4KK35FDlV8^K3c2?X;hR1HC>KTb5w%Pz7A(LLc<#1Od!wXT)v+=AEtA5Q*Ze@H@b z7rWbIf1%kXkG+E(Ylh0|y|A~(YNJe)^)878Hb9RxdfDkc0|yUqiy{pqyb4?#rtt)v z;MQ-_$ppMU6^mq=M4?0|i5X%CnbuVzrI75HrgvXx3Y)n@p$U^{hz|5Xb6K}yC!A!i z8ryRR6-wy!X{hj7jx1x#LP=W>sp)Du*aPA6h-7+oH-#gbWZBpZ&ngDpoPnBpStU*? gl-j~oi?N7hNV7%Q6!tnJCoQBQzbH-GPTVw!Q_D+QP)f8hg2YWy5w#>HQBV_m;~m?Z?(S@M zXOozVW1y&_5+sLeI3V$J04jtk4#+}P5#quPQBW^Pa6{r2IB)~Oo3-OOEqk!mGjG24 zz4yIuc6+;Hd%I(&M+)usPDr6r`g&Tro(_JQZus!u^NFj0uEu)-dN%)Sekpfz=KbmJ zar8`hq&wO^_}ajD|L@_?`}$6Oc5=Gc>6z?&x8;wn*do4(j8g8C>n*XVw{<1lW{_Z*URzqYoFe~*mBMC`Uy!8?~ z9(;R|+oR|tzcY;5+9Zu+RnK5^$#FL@xA5ItDuT3 zoh?zUGgzmdp<&3#ch=GIVvV3nm}lc5+o2n}1_xPQWj?k`97u{?&$g+V~>%5Fna_bh&&KtCe##5DKgvC^A}U4;+F95X0~}3Jk-g*ru+l0}f_X5Uw;! z^ZPVgfR@DYMd|=Yh_^ilq9GERAxO7f$#a zVpH&4_lTo|fVzbhVix0a#&qQjwX%9ncGnHrEWmF}w{)hfMhxB+nV4}!hBTFA2@NC` zXkriq#vur8H3cd&$m+%fYRt~thY)07?K>$L2;2xgJ~SFgRE-g-7~^I`#TeIy(Xo1C zOabm1$vITyz!to@8%}yi~S&fSsSzMZ*SzMaJ1PY~23{TTd0@E4wi>@qUTg_Zk zbI`_4VFZhcp?}y6@fe=5Fm*JTLeNoY4xKwJ?WSc=Rr5_lY}HX2F$z_Id0!0m7XQBl zjaCkd?mkk^WOdW8M+kM8bDfkE)Gkz{q=sOrxXhteE-sR$pmB;^tgeW=h1T}{nK7y6 z!A+pZ`yoSMCy~xp;gS*2FdF+vu{8*U|H8Ze$cP}BQ5gz=8H3x%A43?$Dy*+v%8X`6 z^$ldKVnpgHNLb<$5dDLB<~tG8!S@zX<8ocd{(y)s__^2I8e~e$`97}ToBclear(); - header('Location: index.php?msg=cache_cleared'); + header('Location: '.BASE_URL); exit; } diff --git a/cms/templates/admin/subtemplates/admin_index.inc.tpl b/cms/templates/admin/subtemplates/admin_index.inc.tpl index 47ab5aa..6007838 100644 --- a/cms/templates/admin/subtemplates/admin_index.inc.tpl +++ b/cms/templates/admin/subtemplates/admin_index.inc.tpl @@ -20,3 +20,10 @@
    • + + + + + diff --git a/cms/templates/admin/subtemplates/admin_menu.inc.tpl b/cms/templates/admin/subtemplates/admin_menu.inc.tpl index f4e5973..0a82bcd 100644 --- a/cms/templates/admin/subtemplates/admin_menu.inc.tpl +++ b/cms/templates/admin/subtemplates/admin_menu.inc.tpl @@ -26,6 +26,10 @@
    • + +
  • +
    • + diff --git a/cms/templates/admin/subtemplates/edit.inc.tpl b/cms/templates/admin/subtemplates/edit.inc.tpl index 0c3747c..587fd7c 100644 --- a/cms/templates/admin/subtemplates/edit.inc.tpl +++ b/cms/templates/admin/subtemplates/edit.inc.tpl @@ -52,13 +52,6 @@ -
    - -
    - -
    -
    -
    @@ -141,6 +134,13 @@
    +
    + +
    + +
    +
    +
    diff --git a/cms/templates/default.tpl b/cms/templates/default.tpl index af3911a..0ab97ee 100644 --- a/cms/templates/default.tpl +++ b/cms/templates/default.tpl @@ -2,7 +2,7 @@ -<?php echo $settings['website_title']; if($page_title): ?> - <?php echo $page_title; elseif($title): ?> - <?php echo $title; endif; ?> +<?php if($page_title): ?><?php echo $page_title; ?><?php else: ?><?php echo $settings['website_title']; ?><?php if($title): ?> - <?php echo $title; ?><?php endif; ?><?php endif; ?> diff --git a/index.php b/index.php index c9fa0c6..98db925 100644 --- a/index.php +++ b/index.php @@ -177,7 +177,7 @@ try { if($cache->cacheId && $cache->doCaching) { - $cache_content = $cache->createCacheContent($template->fetch(BASE_PATH.'templates/'.$template_file), $content_type, CHARSET); + $cache_content = $cache->createCacheContent($template->fetch(BASE_PATH.'cms/templates/'.$template_file), $content_type, CHARSET); $cache->createChacheFile($cache_content); } } diff --git a/static/css/style.css b/static/css/style.css index dd311c6..2ffba6b 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -1,7 +1,7 @@ body { margin-bottom: 20px; } body.admin { padding-top: 50px; padding-bottom: 20px;margin-bottom: 20px; } -#logo { margin:30px 0 15px -20px; font-family:Patua One; font-size:48px; font-weight:bold; transform:rotate(-6deg); } +#logo { margin:30px 0 15px -20px; font-family:Patua One; font-size:48px; font-weight:bold; transform:rotate(-6deg); -moz-transform:rotate(-6deg); -webkit-transform:rotate(-6deg); } #logo a { padding:5px; color:#333; text-decoration:none; border:5px solid #333; border-radius:10px; } #logo a:hover { color:#3276b1; border:5px solid #3276b1; }