From 323d1b376423f09d758b381defcf37b26d582a7a Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Sun, 13 Feb 2011 17:30:05 +0000 Subject: improved history --- .../Application/Controllers/BaseController.php | 8 +++- h-source/Application/Include/languages.php | 3 ++ h-source/Application/Views/Last/modifications.php | 2 - h-source/Application/Views/header.php | 6 ++- h-source/Application/Views/right.php | 18 ++++++++- h-source/Public/Css/explorer6.css | 5 +++ h-source/Public/Css/explorer7.css | 5 +++ h-source/Public/Css/website.css | 44 +++++++++++++++++++++ h-source/Public/Img/back_last.png | Bin 0 -> 2576 bytes 9 files changed, 86 insertions(+), 5 deletions(-) create mode 100644 h-source/Public/Img/back_last.png diff --git a/h-source/Application/Controllers/BaseController.php b/h-source/Application/Controllers/BaseController.php index db85405..7eb4236 100644 --- a/h-source/Application/Controllers/BaseController.php +++ b/h-source/Application/Controllers/BaseController.php @@ -46,6 +46,7 @@ class BaseController extends Controller header("Cache-Control: no-cache"); $this->model('BoxesModel'); + $this->model('HistoryModel'); $this->load('header'); $this->load('footer','last'); @@ -116,7 +117,12 @@ class BaseController extends Controller $data['language_links'] = $this->buildLanguageLinks($this->lang); -// print_r($this->_queryString); + $data['lastModif'] = $this->m['HistoryModel'] + ->select() + ->where(array('type'=>'wiki','gr'=>'registered')) + ->orderBy('id_history desc') + ->limit(5) + ->send(); $this->append($data); $this->load('right'); diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php index 40014b0..9b0d9ab 100644 --- a/h-source/Application/Include/languages.php +++ b/h-source/Application/Include/languages.php @@ -173,6 +173,8 @@ class Lang "has been inserted by" => "è stato inserito da", "has been updated by" => "è stato modificato da", "at" => "alle ore", + "last modifications" => "ultime modifiche", + "watch all modifications" => "guarda tutte le modifiche", ), 'es' => array ( @@ -474,6 +476,7 @@ class Go $urls = getUrlsFromIdHard($clean['idHard']); return $urls['urlView']; } + } class MyStrings diff --git a/h-source/Application/Views/Last/modifications.php b/h-source/Application/Views/Last/modifications.php index 1c8e8ea..8683615 100644 --- a/h-source/Application/Views/Last/modifications.php +++ b/h-source/Application/Views/Last/modifications.php @@ -32,8 +32,6 @@
- +
">
@@ -89,6 +89,22 @@
">
+ +
+
+ +
+ +
+ + "> + +
+
diff --git a/h-source/Public/Css/explorer6.css b/h-source/Public/Css/explorer6.css index dcdc4b0..c4bacc8 100644 --- a/h-source/Public/Css/explorer6.css +++ b/h-source/Public/Css/explorer6.css @@ -100,4 +100,9 @@ ul#menuBlock li ul { .language_links_box a.current_lang { background:#6495ED; +} + +.last_modifications ul +{ + margin-left:0px; } \ No newline at end of file diff --git a/h-source/Public/Css/explorer7.css b/h-source/Public/Css/explorer7.css index 11c9f02..4060474 100644 --- a/h-source/Public/Css/explorer7.css +++ b/h-source/Public/Css/explorer7.css @@ -9,4 +9,9 @@ .language_links_box a.current_lang { background:#6495ED; +} + +.last_modifications ul +{ + margin-left:0px; } \ No newline at end of file diff --git a/h-source/Public/Css/website.css b/h-source/Public/Css/website.css index def10fa..e3960ba 100755 --- a/h-source/Public/Css/website.css +++ b/h-source/Public/Css/website.css @@ -1614,4 +1614,48 @@ td.text_item_date { text-decoration:none; font:normal 16px/1 sans-serif; +} + +.last_modifications +{ + margin:5px; + width:190px; +/* background:red; */ + margin-bottom:2em; + background: url(../Img/back_last.png) no-repeat top left; +} +.last_modifications ul +{ + padding:8px; + padding-top:0px; +} +.last_modifications li +{ + list-style-type:none; + margin:10px 5px; +} +.last_modifications_title +{ + padding-top:10px; + padding-left:14px; + font:bold 15px/1 sans-serif; +} +.last_modifications a +{ + +} +.last_modifications_model +{ + color:#3e3e3e; + text-decoration:none; +} +.last_modifications_all +{ + background: url(../Img/back_last.png) no-repeat bottom left; + padding-bottom:10px; +} +.last_modifications_all span +{ + margin-left:10px; + font:normal 14px/1 sans-serif; } \ No newline at end of file diff --git a/h-source/Public/Img/back_last.png b/h-source/Public/Img/back_last.png new file mode 100644 index 0000000..6411e49 Binary files /dev/null and b/h-source/Public/Img/back_last.png differ -- cgit v1.2.3