From 413e193cee27cfaad52fdd0aa9db3a3feefa9e61 Mon Sep 17 00:00:00 2001 From: "Mark (ilosuna)" Date: Mon, 14 Oct 2013 21:32:06 +0200 Subject: [PATCH] style edits --- 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/classes/News.class.php | 55 +++++++++----------- cms/lang/english.page.lang.php | 2 +- cms/templates/default.tpl | 3 +- cms/templates/subtemplates/comments.inc.tpl | 26 +++++---- cms/templates/subtemplates/news.inc.tpl | 11 ++-- cms/templates/subtemplates/overview.inc.tpl | 11 ++-- static/css/style.css | 25 +++++---- 10 files changed, 67 insertions(+), 66 deletions(-) diff --git a/cms/data/content.sqlite b/cms/data/content.sqlite index bf93c680b801d0720de5a6018fcf2bb03c3802f3..0674678f94520e0528f4055b990f2cd9f511082f 100644 GIT binary patch delta 411 zcmZo@kZ5R-m>|vgXQGTV5`+sD0PvG+wEVm>M^n~F!0Tv z=qSZfsKGjSW8-XACcegvjni4TAO6Pb$vnOLHERZQjP26x-(IsCu})w4pEVo+=m?kP delta 375 zcmZo@kZ5R-m>|t~a-xhgpVCHQ4@s11p;d6W6JYjmNmQ z?>*1TC&a|iH~s8G)-IN2EnTzer;oBKFltVJdz96OIdV$hbem(W0Ze*&(=(2ZhFosR$ghw{Ib-dvdq-- zppfKt1`xsM4;7hi|A19;+C$cZ(_^2qicMdBlGVrwrdq!sF+Ek+uqFUVDHz7aDkSEm zC`3o2N*h6>jbdZW{^2z1S?28rzp;8VZ=5ifb^6Nxtl5sw1^Vk!;? diff --git a/cms/data/userdata.sqlite b/cms/data/userdata.sqlite index d3c16624e4610b7d5e66af2f446c60b54b39c58d..fcba7b87d4ee83fbff766600848b6a069da3337c 100644 GIT binary patch delta 22 dcmZorXi%6S%~&>3#+k8fW5OJMmKZl~1^`ZD1~&iz delta 22 dcmZorXi%6S%~&!~#+k8XW5OJMmgpZh830k=2eJSF diff --git a/cms/includes/classes/News.class.php b/cms/includes/classes/News.class.php index 9e5189c..cdcc2c4 100644 --- a/cms/includes/classes/News.class.php +++ b/cms/includes/classes/News.class.php @@ -62,12 +62,12 @@ class News if($this->category) { - $dbr = Database::$content->prepare("SELECT id, page, title, page_title, category, type, time, teaser_headline, teaser, teaser_formatting, teaser_img, link_name, headline, content, content_formatting FROM ".Database::$db_settings['pages_table']." WHERE include_page=:include_page AND time<=:time AND category=:category AND status!=0 ORDER BY time DESC LIMIT ".(($this->current_page-1)*$this->news_per_page).", ".$this->news_per_page); + $dbr = Database::$content->prepare("SELECT id, page, title, page_title, category, type, time, teaser_headline, teaser, teaser_img, link_name, headline, content FROM ".Database::$db_settings['pages_table']." WHERE include_page=:include_page AND time<=:time AND category=:category AND status!=0 ORDER BY time DESC LIMIT ".(($this->current_page-1)*$this->news_per_page).", ".$this->news_per_page); $dbr->bindParam(':category', $this->category, PDO::PARAM_STR); } else { - $dbr = Database::$content->prepare("SELECT id, page, title, page_title, category, type, time, teaser_headline, teaser, teaser_formatting, teaser_img, link_name, headline, content, content_formatting FROM ".Database::$db_settings['pages_table']." WHERE include_page=:include_page AND time<=:time AND status!=0 ORDER BY time DESC LIMIT ".(($this->current_page-1)*$this->news_per_page).", ".$this->news_per_page); + $dbr = Database::$content->prepare("SELECT id, page, title, page_title, category, type, time, teaser_headline, teaser, teaser_img, link_name, headline, content FROM ".Database::$db_settings['pages_table']." WHERE include_page=:include_page AND time<=:time AND status!=0 ORDER BY time DESC LIMIT ".(($this->current_page-1)*$this->news_per_page).", ".$this->news_per_page); } $dbr->bindParam(':include_page', $this->id, PDO::PARAM_INT); $dbr->bindParam(':time', $this->current_time, PDO::PARAM_INT); @@ -125,26 +125,19 @@ class News } if($news_data['teaser']!='') { - if($news_data['teaser_formatting']==1) - { - $news[$i]['teaser'] = auto_html($news_data['teaser']); - } - else - { - $news[$i]['teaser'] = $news_data['teaser']; - } + $news[$i]['teaser'] = $news_data['teaser']; $news[$i]['more'] = true; } else { - if($news_data['content_formatting']==1) - { - $news[$i]['teaser'] = auto_html($news_data['content']); - } - else - { + #if($news_data['content_formatting']==1) + # { + # $news[$i]['teaser'] = auto_html($news_data['content']); + # } + #else + # { $news[$i]['teaser'] = $news_data['content']; - } + # } $news[$i]['teaser'] = parse_special_tags($news[$i]['teaser'], $news_data['page']); $news[$i]['more'] = false; } @@ -178,7 +171,7 @@ class News public function get_feed($rss_maximum_items=20, $fullfeed=false) { - $dbr = Database::$content->prepare("SELECT id, page, type, category, title, teaser, teaser_formatting, teaser_img, headline, content, content_formatting, time, last_modified FROM ".Database::$db_settings['pages_table']." WHERE include_page=:include_page AND time<=:time AND status!=0 ORDER BY time DESC LIMIT ".$rss_maximum_items); + $dbr = Database::$content->prepare("SELECT id, page, type, category, title, teaser, teaser_img, headline, content, time, last_modified FROM ".Database::$db_settings['pages_table']." WHERE include_page=:include_page AND time<=:time AND status!=0 ORDER BY time DESC LIMIT ".$rss_maximum_items); $dbr->bindParam(':include_page', $this->id, PDO::PARAM_INT); $dbr->bindParam(':time', $this->current_time, PDO::PARAM_INT); $dbr->execute(); @@ -195,26 +188,26 @@ class News if($fullfeed || $rss_data['teaser']=='') { - if($rss_data['content_formatting']==1) - { - $rss_items[$i]['content'] = auto_html($rss_data['content']); - } - else - { + #if($rss_data['content_formatting']==1) + # { + # $rss_items[$i]['content'] = auto_html($rss_data['content']); + # } + #else + # { $rss_items[$i]['content'] = $rss_data['content']; - } + # } $rss_items[$i]['content'] = parse_special_tags($rss_items[$i]['content'], $parent_page=$rss_data['page'], $rss=true); } else { - if($rss_data['teaser_formatting']==1) - { + #if($rss_data['teaser_formatting']==1) + # { $rss_items[$i]['content'] = auto_html($rss_data['teaser']); - } - else - { + # } + #else + # { $rss_items[$i]['content'] = $rss_data['teaser']; - } + # } } if(!$fullfeed && $rss_data['teaser_img']) diff --git a/cms/lang/english.page.lang.php b/cms/lang/english.page.lang.php index b7523a8..ad69161 100644 --- a/cms/lang/english.page.lang.php +++ b/cms/lang/english.page.lang.php @@ -68,7 +68,7 @@ $lang['comment_delete_link'] = 'delete'; $lang['comment_delete_confirm'] = 'Do you really want to delete this comment?'; $lang['comment_edit_link'] = 'edit'; $lang['comment_note_email'] = '(optional)'; -$lang['comments_open'] = 'open'; +$lang['comments_open'] = 'open comments'; $lang['comments_close'] = 'Close comments'; $lang['comment_notification_subject'] = 'Comment to [page]'; $lang['comment_notification_message'] = "[name]\n\n[comment]\n\n[link]"; diff --git a/cms/templates/default.tpl b/cms/templates/default.tpl index 899a457..593ca98 100644 --- a/cms/templates/default.tpl +++ b/cms/templates/default.tpl @@ -91,7 +91,7 @@ -

© 2013

Powered by phpSQLiteCMS

+

©

Powered by phpSQLiteCMS

@@ -112,4 +112,3 @@ - diff --git a/cms/templates/subtemplates/comments.inc.tpl b/cms/templates/subtemplates/comments.inc.tpl index 5957083..dd90cb9 100644 --- a/cms/templates/subtemplates/comments.inc.tpl +++ b/cms/templates/subtemplates/comments.inc.tpl @@ -1,5 +1,14 @@
-

()

+
+ + + + + + + +

+
@@ -8,12 +17,12 @@


-

+


-

+


-

-

+

+

@@ -73,7 +82,7 @@ -

+

@@ -129,11 +138,8 @@ -

 

+

- -

-
diff --git a/cms/templates/subtemplates/news.inc.tpl b/cms/templates/subtemplates/news.inc.tpl index 6acd787..96961d1 100644 --- a/cms/templates/subtemplates/news.inc.tpl +++ b/cms/templates/subtemplates/news.inc.tpl @@ -1,7 +1,7 @@ -
+

@@ -15,9 +15,12 @@ - -

-()

+ +

+ + +

+

diff --git a/cms/templates/subtemplates/overview.inc.tpl b/cms/templates/subtemplates/overview.inc.tpl index abb98a2..afffc2c 100644 --- a/cms/templates/subtemplates/overview.inc.tpl +++ b/cms/templates/subtemplates/overview.inc.tpl @@ -6,20 +6,17 @@
- +

-
- <?php echo $included_pages[$n]['teaser_headline']; ?> -


-

+

+

-
- +
diff --git a/static/css/style.css b/static/css/style.css index fe673b8..a4bd6fc 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -1,5 +1,5 @@ -body { margin-bottom: 20px; } -body.admin { padding-top: 50px; padding-bottom: 20px;margin-bottom: 20px; } +body { margin-bottom:30px; } +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); -moz-transform:rotate(-6deg); -webkit-transform:rotate(-6deg); } #logo a { padding:5px; color:#333; text-decoration:none; border:5px solid #333; border-radius:10px; } @@ -29,15 +29,6 @@ header ul { padding:20px 0 0 0; } .thumbnail img { width:100%; } a.thumbnail:hover { opacity:0.9; } -.news-teaser { margin-bottom:30px; } -.news-teaser:first-child { padding-top:20px; } -.news-teaser h2 { font-size:26px; margin:0; padding:0; } -.news-teaser p { margin:0; padding:0; } -.news-teaser .time { color:#808080; font-size:13px; margin:0 0 7px 0; padding:0; } - -.simple-news h2 { margin:10px 0; } -.simple-news-delete { background:#f2dede; } - .caption + p { margin-top:20px; } .topspace { margin-top:10px; } @@ -53,6 +44,18 @@ a.thumbnail:hover { opacity:0.9; } .alert h3 { margin:0; } .alert-danger h3 { color:#b94a48; } +.overview h2 a { color:#333; text-decoration:none; } + +.news { margin-bottom:30px; } +.news:first-child { margin-top:20px; } +.news h2 { margin:0; padding:0; } +.news h2 a { color:#333; text-decoration:none; } +.news .time { color:#808080; font-size:13px; margin:0 0 7px 0; padding:0; } + +.simple-news h2 { margin:10px 0; } +.simple-news h2 a { color:#333; text-decoration:none; } +.simple-news-delete { background:#f2dede; } + #comments { margin-top:50px; } #commentformwrapper { padding-top:20px; } h3#preview { color:#ca9853; margin-bottom:10px;}