From 0549ab7439ed39993cec9b41121bae0d6984e15b Mon Sep 17 00:00:00 2001 From: "Mark (ilosuna)" Date: Sat, 16 Nov 2013 09:21:22 +0100 Subject: [PATCH] Bootstrap update to version 3.0.2 --- cms/data/content.sqlite | Bin 393216 -> 393216 bytes cms/data/entries.sqlite | Bin 19456 -> 19456 bytes cms/data/userdata.sqlite | Bin 4096 -> 4096 bytes cms/includes/functions.inc.php | 22 ++++++++++++---------- cms/lang/english.page.lang.php | 4 ++-- cms/templates/admin/main.tpl | 4 ++-- cms/templates/default.tpl | 10 +++++----- cms/templates/subtemplates/notes.inc.tpl | 20 ++++++++++---------- index.php | 18 +++++++++--------- static/css/style.css | 10 ++++++---- 10 files changed, 46 insertions(+), 42 deletions(-) diff --git a/cms/data/content.sqlite b/cms/data/content.sqlite index 1650f73bc094dfffac92c39373cac223f2afae1e..2e2b98907394b716df31d441a984cf706999e0af 100644 GIT binary patch delta 948 zcmZWmZEO>D7{9y!J%3(L_5t;S*;EogY8!?z`h0kv=8qH=!(tbA1TL-l!?K`7KUsf(3-=cq{zozH(!@5VgqraB@0z@6&qoIUzQbVW7MgtR#4;i(I0|x5A zy$0IVWZos3{teYoY@j!Amx<1KthWfye^3J7HBsv{VFkGOfD~{}hZg+10K3U3 zE)7HT`lKXGWU4XwTEy;fDw=3`q&qy6p2PtGyw02sITA0X;e{1}J1J(Q@&6NjCM=Tf z741Wh1m)c8feND9N6WTO(tTeuZnwt{1a02*Nv@YbuO;W3UNLZ@Glk z7)-487eszs%sWdlI7&6=65YH%l^2J1Zf@J0=#eCeWm)`X8aCjMWnik$8VhBHLfckU z*owoxdVfY7O7kIUa8wkW+i|#0{^NRWC)^~R_jZ9yI=hX#+@IKBWeraQ$Y_KR}uE?hPA e%^OhhPy-9j``^P8K=ZeVH%s=6Q&@l#oBjqJNjQ-J delta 906 zcmZXRZERCz6vv9CVsBE)iW$t0>B16>G3)JuD)!J2%3O`gf4G#Mq#NjVV?q8${kA%+oz>fPL%U&gP--~!{q&rCpH3(? zeN5j*-MS!4>MxWT>s3&1(k0p>`OHwW_Kmhn+o44@k9aQW=Tq}COW#ryh`+x*H=RKm{48}Yf~QZg$hv%On$$#~Xk_p4!K zLzb~Ig=}IKDtX1O?n2IK39+>*3EOEmvd^S^SS9;03sBPJ*5@PljQEdZ8z^~|eND;7 z75bm3;@`-MS({Eyutz$X=P^D-p64j~&}k6vG)jIiI6^Hb)Y5ftb>HfTJwF%Cnvig$ zoi(Mv3x|BR-6{4)3hK(Dw4+-}h^$2;KK5k_B77&{SauF8CkILb_Fg0zt;uV ziQuj&nxjsk@kr4u!$~CETRlRJO2(B delta 44 zcmV+{0Mq|~m;r#80gxL3@sS)u0r9b5sRIGkvkC;t0|hSt001kIfhV#E{{sOlq6|P> CQw~7@ diff --git a/cms/data/userdata.sqlite b/cms/data/userdata.sqlite index fcba7b87d4ee83fbff766600848b6a069da3337c..3fe51e923b5cabc95cf46a4a11cfd8073e070892 100644 GIT binary patch delta 22 dcmZorXi%6S%~&;2#+k8dW5OJMmUiV+3;3#+k8fW5OJMmKZl~1^`ZD1~&iz diff --git a/cms/includes/functions.inc.php b/cms/includes/functions.inc.php index 66fa90c..846d42b 100644 --- a/cms/includes/functions.inc.php +++ b/cms/includes/functions.inc.php @@ -5,6 +5,7 @@ function __autoload($class_name) require_once(BASE_PATH.'cms/includes/classes/'.$class_name.'.class.php'); } +/* if(get_magic_quotes_gpc()) { function stripslashes_deep($value) @@ -17,6 +18,7 @@ if(get_magic_quotes_gpc()) $_COOKIE = array_map('stripslashes_deep', $_COOKIE); $_REQUEST = array_map('stripslashes_deep', $_REQUEST); } +*/ function showme($what) { @@ -998,20 +1000,20 @@ function raise_error($error,$error_message='') else $message = 'The server is currently unable to handle the request.'; break; } - ?> - + ?> + + + <?php echo $website_title.' - '.$title; ?> diff --git a/cms/lang/english.page.lang.php b/cms/lang/english.page.lang.php index ad69161..6aa0764 100644 --- a/cms/lang/english.page.lang.php +++ b/cms/lang/english.page.lang.php @@ -45,8 +45,8 @@ $lang['comments_pagination_info'] = '[total_comments] comments, page [curre $lang['comments_add_comment'] = 'Add comment'; $lang['comment_input_text'] = 'Add comment:'; $lang['comment_edit_text'] = 'Edit comment:'; -$lang['comment_input_name'] = 'Name:'; -$lang['comment_input_email_hp'] = 'E-mail or homepage:'; +$lang['comment_input_name'] = 'Name'; +$lang['comment_input_email_hp'] = 'E-mail or homepage'; $lang['comment_input_submit'] = ' OK '; $lang['comment_input_preview'] = 'Preview'; $lang['comment_preview_hl'] = 'Preview:'; diff --git a/cms/templates/admin/main.tpl b/cms/templates/admin/main.tpl index 672c658..d6a2509 100644 --- a/cms/templates/admin/main.tpl +++ b/cms/templates/admin/main.tpl @@ -5,7 +5,7 @@ <?php echo $settings['website_title']; ?> - <?php echo $lang['administration']; if(isset($subtitle)) echo ' - ' . $subtitle; ?> - + @@ -45,7 +45,7 @@ - + diff --git a/cms/templates/default.tpl b/cms/templates/default.tpl index bb3e099..73e44d7 100644 --- a/cms/templates/default.tpl +++ b/cms/templates/default.tpl @@ -7,7 +7,7 @@ - + @@ -59,7 +59,7 @@
-
+
@@ -68,7 +68,7 @@
-
+
@@ -100,12 +100,12 @@
- + - + diff --git a/cms/templates/subtemplates/notes.inc.tpl b/cms/templates/subtemplates/notes.inc.tpl index d69746d..5607fe5 100644 --- a/cms/templates/subtemplates/notes.inc.tpl +++ b/cms/templates/subtemplates/notes.inc.tpl @@ -1,22 +1,22 @@ - -
-

-

- -

-
- + +
+

+

+

+

+
+ - +

[ « .. » -]

+]

diff --git a/index.php b/index.php index 98db925..11b21a5 100644 --- a/index.php +++ b/index.php @@ -72,7 +72,7 @@ try // load replacement functions for the multibyte string functions // if they are not available: - if(!defined('MB_CASE_LOWER')) require('./cms/includes/functions.mb_replacements.inc.php'); + #if(!defined('MB_CASE_LOWER')) require('./cms/includes/functions.mb_replacements.inc.php'); require('./cms/includes/classes/Database.class.php'); $database = new Database(); @@ -151,16 +151,16 @@ try } } - if(isset($_GET['get_1']) && $_GET['get_1']==IMAGE_IDENTIFIER && isset($_GET['get_2'])) - { - // photo: - include(BASE_PATH.'cms/includes/photo.inc.php'); - } - else - { + #if(isset($_GET['get_1']) && $_GET['get_1']==IMAGE_IDENTIFIER && isset($_GET['get_2'])) + # { + # // photo: + # include(BASE_PATH.'cms/includes/photo.inc.php'); + # } + #else + # { // regular content: include(BASE_PATH.'cms/includes/content.inc.php'); - } + # } if(isset($_SESSION[$settings['session_prefix'].'user_id'])) $localization->add_language_file(BASE_PATH.'cms/lang/'.$settings['admin_language'].'.admin.lang.php'); diff --git a/static/css/style.css b/static/css/style.css index a4bd6fc..d1c4271 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -18,9 +18,12 @@ header ul { padding:20px 0 0 0; } .topsep { margin:10px 0 15px 0; } .main-content p, -.main-content ul, +.main-content ul { line-height:175%; } +.sidebar { margin-top:30px; } .sidebar p, .sidebar ul { line-height:175%; } +.teaser p { margin-top:0; } +.teaser .thumbnail { margin-bottom:5px; } .caption { margin:3px 0 3px 0; color:#808080; font-style:italic; } .thumbnail { max-width:100% !important; height:auto; } @@ -46,7 +49,7 @@ a.thumbnail:hover { opacity:0.9; } .overview h2 a { color:#333; text-decoration:none; } -.news { margin-bottom:30px; } +.news { margin:30px 0 30px 0; } .news:first-child { margin-top:20px; } .news h2 { margin:0; padding:0; } .news h2 a { color:#333; text-decoration:none; } @@ -100,9 +103,8 @@ a.pdf { padding-left:23px; background-image:url(../img/p @media (min-width: 992px) { - .sidebar { padding-left:30px; } .header .nav { margin-top:37px; float:right; text-align:right; } - .sidebar { padding-left:50px; } + .sidebar { margin-top:0; } } @media screen and (max-width:768px)