From 8905bd58e39efc2f5a595082bd2fb61a2c047899 Mon Sep 17 00:00:00 2001 From: rWatcher Date: Tue, 17 Nov 2009 02:21:09 -0500 Subject: [PATCH 01/33] Remove "overlap dates" from calendar view. --- modules/calendarview/views/kohana_calendar.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/calendarview/views/kohana_calendar.php b/modules/calendarview/views/kohana_calendar.php index e227803d..ff510658 100644 --- a/modules/calendarview/views/kohana_calendar.php +++ b/modules/calendarview/views/kohana_calendar.php @@ -43,7 +43,11 @@ else } ?> + + + + From 3cb8810074123de9fa948db4321d9e00f1990e91 Mon Sep 17 00:00:00 2001 From: rWatcher Date: Tue, 17 Nov 2009 02:44:29 -0500 Subject: [PATCH 02/33] Move the CSS from the view file into a seperate .css file. --- modules/calendarview/controllers/calendarview.php | 1 + modules/calendarview/css/calendarview_calendar.css | 8 ++++++++ modules/calendarview/views/calendarview_year.html.php | 11 ----------- 3 files changed, 9 insertions(+), 11 deletions(-) create mode 100644 modules/calendarview/css/calendarview_calendar.css diff --git a/modules/calendarview/controllers/calendarview.php b/modules/calendarview/controllers/calendarview.php index 1d323558..3e03cb5f 100644 --- a/modules/calendarview/controllers/calendarview.php +++ b/modules/calendarview/controllers/calendarview.php @@ -32,6 +32,7 @@ class CalendarView_Controller extends Controller { // Draw the page. $template = new Theme_View("page.html", "CalendarView"); + $template->css("calendarview_calendar.css"); $template->page_title = t("Gallery :: Calendar"); $template->content = new View("calendarview_year.html"); $template->content->calendar_year = $display_year; diff --git a/modules/calendarview/css/calendarview_calendar.css b/modules/calendarview/css/calendarview_calendar.css new file mode 100644 index 00000000..12edad10 --- /dev/null +++ b/modules/calendarview/css/calendarview_calendar.css @@ -0,0 +1,8 @@ +table.calendar { text-align: center; width:100px; } +table.calendar caption { font-size: 1.5em; padding: 0.2em; } +table.calendar th, table.calendar td { padding: 0.2em; background: #fff; border: 0; } +table.calendar td:hover { background: #ddf; } +table.calendar td.prev-next { background: #ccc; color: #999; } +table.calendar td.today { color: #800; } +#cal_user, #cal_year, #g-view-calendar-form li { display: inline; } +#SaveSettings { float: right; } diff --git a/modules/calendarview/views/calendarview_year.html.php b/modules/calendarview/views/calendarview_year.html.php index 851b4e91..59389d18 100644 --- a/modules/calendarview/views/calendarview_year.html.php +++ b/modules/calendarview/views/calendarview_year.html.php @@ -1,15 +1,4 @@ -

From 47d1f16b40120f975447ec14b067576b0c62ea11 Mon Sep 17 00:00:00 2001 From: rWatcher Date: Wed, 18 Nov 2009 15:03:16 -0500 Subject: [PATCH 03/33] Added a month view and breadcrumbs to album view. --- .../calendarview/controllers/calendarview.php | 110 +++++++++++++++++- .../libraries/Calendar_Breadcrumb.php | 51 ++++++++ .../calendarview/views/kohana_calendar.php | 4 +- 3 files changed, 159 insertions(+), 6 deletions(-) create mode 100644 modules/calendarview/libraries/Calendar_Breadcrumb.php diff --git a/modules/calendarview/controllers/calendarview.php b/modules/calendarview/controllers/calendarview.php index 68a3d75d..45d847c2 100644 --- a/modules/calendarview/controllers/calendarview.php +++ b/modules/calendarview/controllers/calendarview.php @@ -33,6 +33,7 @@ class CalendarView_Controller extends Controller { // Draw the page. $template = new Theme_View("page.html", "other", "CalendarView"); $template->css("calendarview_calendar.css"); + $template->set_global("calendar_user", $display_user); $template->page_title = t("Gallery :: Calendar"); $template->content = new View("calendarview_year.html"); $template->content->calendar_year = $display_year; @@ -45,6 +46,7 @@ class CalendarView_Controller extends Controller { // Display all images for the specified day. // Figure out the total number of photos to display. + $day_count = 0; if ($display_user == "-1") { $day_count = ORM::factory("item") ->viewable() @@ -66,19 +68,25 @@ class CalendarView_Controller extends Controller { // Figure out paging stuff. $page_size = module::get_var("gallery", "page_size", 9); - $page = $this->input->get("page", "1"); + $page = (int) $this->input->get("page", "1"); $offset = ($page-1) * $page_size; - $max_pages = ceil($day_count / $page_size); + $max_pages = max(ceil($day_count / $page_size), 1); // Make sure that the page references a valid offset - if ($page < 1 || ($day_count && $page > ceil($day_count / $page_size))) { + if (($page < 1) || ($page > $max_pages)) { Kohana::show_404(); } // Set up the page. - $template = new Theme_View("page.html", "other", "CalendarDayView"); - $template->page_title = t("Gallery :: Calendar"); + $template = new Theme_View("page.html", "collection", "CalendarDayView"); + $template->set_global("page", $page); + $template->set_global("max_pages", $max_pages); $template->set_global("page_size", $page_size); + $template->page_title = t("Gallery :: Calendar"); + + $template->set_global("first_visible_position", $offset+1); + $template->set_global("last_visible_position", $offset+$page_size); + // $template->set_global("total", $day_count); // Figure out which photos go on this page. if ($display_user == "-1") { @@ -102,11 +110,103 @@ class CalendarView_Controller extends Controller { // Finish setting up and then display the page. $template->set_global("children_count", $day_count); + + $calendar_breadcrumbs[0] = new Calendar_Breadcrumb($display_year, url::site("calendarview/calendar/" . $display_year . "/" . $display_user)); + $calendar_breadcrumbs[1] = new Calendar_Breadcrumb(date("F", mktime(0, 0, 0, $display_month, $display_day, $display_year)), url::site("calendarview/month/" . $display_year . "/" . $display_user . "/" . $display_month)); + $fake_item = new Calendar_Breadcrumb($display_day, ""); + + //$photo = ORM::factory("item", "3"); + $template->set_global("item", $fake_item); + $template->set_global("parents", $calendar_breadcrumbs); + + $template->content = new View("dynamic.html"); $template->content->title = t("Photos From ") . date("d F Y", mktime(0, 0, 0, $display_month, $display_day, $display_year)); print $template; } + public function month($display_year, $display_user, $display_month) { + // Display all images for the specified month. + + // Figure out the total number of photos to display. + $day_count = 0; + if ($display_user == "-1") { + $day_count = ORM::factory("item") + ->viewable() + ->where("type !=", "album") + ->where("captured >=", mktime(0, 0, 0, $display_month, 1, $display_year)) + ->where("captured <", mktime(0, 0, 0, $display_month+1, 1, $display_year)) + ->find_all() + ->count(); + } else { + $day_count = ORM::factory("item") + ->viewable() + ->where("owner_id", $display_user) + ->where("type !=", "album") + ->where("captured >=", mktime(0, 0, 0, $display_month, 1, $display_year)) + ->where("captured <", mktime(0, 0, 0, $display_month+1, 1, $display_year)) + ->find_all() + ->count(); + } + + // Figure out paging stuff. + $page_size = module::get_var("gallery", "page_size", 9); + $page = (int) $this->input->get("page", "1"); + $offset = ($page-1) * $page_size; + $max_pages = max(ceil($day_count / $page_size), 1); + + // Make sure that the page references a valid offset + if (($page < 1) || ($page > $max_pages)) { + Kohana::show_404(); + } + + // Set up the page. + $template = new Theme_View("page.html", "collection", "CalendarMonthView"); + $template->set_global("page", $page); + $template->set_global("max_pages", $max_pages); + $template->set_global("page_size", $page_size); + $template->page_title = t("Gallery :: Calendar"); + + $template->set_global("first_visible_position", $offset+1); + $template->set_global("last_visible_position", $offset+$page_size); + // $template->set_global("total", $day_count); + + // Figure out which photos go on this page. + if ($display_user == "-1") { + $template->set_global("children", ORM::factory("item") + ->viewable() + ->where("type !=", "album") + ->where("captured >=", mktime(0, 0, 0, $display_month, 1, $display_year)) + ->where("captured <", mktime(0, 0, 0, $display_month+1, 1, $display_year)) + ->orderby("captured", "ASC") + ->find_all($page_size, $offset)); + } else { + $template->set_global("children", ORM::factory("item") + ->viewable() + ->where("owner_id", $display_user) + ->where("type !=", "album") + ->where("captured >=", mktime(0, 0, 0, $display_month, 1, $display_year)) + ->where("captured <", mktime(0, 0, 0, $display_month+1, 1, $display_year)) + ->orderby("captured", "ASC") + ->find_all($page_size, $offset)); + } + + // Finish setting up and then display the page. + $template->set_global("children_count", $day_count); + + $calendar_breadcrumbs[0] = new Calendar_Breadcrumb($display_year, url::site("calendarview/calendar/" . $display_year . "/" . $display_user)); + $fake_item = new Calendar_Breadcrumb(date("F", mktime(0, 0, 0, $display_month, 1, $display_year)), ""); + + //$photo = ORM::factory("item", "3"); + $template->set_global("item", $fake_item); + $template->set_global("parents", $calendar_breadcrumbs); + + + $template->content = new View("dynamic.html"); + $template->content->title = t("Photos From ") . date("F Y", mktime(0, 0, 0, $display_month, 1, $display_year)); + print $template; + } + private function _get_calenderprefs_form($display_year, $display_user) { // Generate a form to allow the visitor to select a year and a gallery photo owner. $form = new Forge("calendarview/setprefs", "", "post", diff --git a/modules/calendarview/libraries/Calendar_Breadcrumb.php b/modules/calendarview/libraries/Calendar_Breadcrumb.php new file mode 100644 index 00000000..954653c6 --- /dev/null +++ b/modules/calendarview/libraries/Calendar_Breadcrumb.php @@ -0,0 +1,51 @@ +title = $new_title; + $this->url = $new_url; + //$this->crumb_url = $new_url; + } + + public function url($query=null) { + //return $crumb_url; + //print $this->url; + //return "http://the.url/"; + return $this->url; + } + + public function parent() { + return $crumb_parent; + } + + public function is_album() { + return false; + } + + public function is_photo() { + return false; + } +} diff --git a/modules/calendarview/views/kohana_calendar.php b/modules/calendarview/views/kohana_calendar.php index ff510658..8eafa2f8 100644 --- a/modules/calendarview/views/kohana_calendar.php +++ b/modules/calendarview/views/kohana_calendar.php @@ -18,7 +18,9 @@ $next = Router::$current_uri.'?'.http_build_query(array_merge($qs, array('month' ?> - + From 92e97357e5d34d113c12c5ed40109dd2ba712648 Mon Sep 17 00:00:00 2001 From: rWatcher Date: Wed, 18 Nov 2009 18:35:31 -0500 Subject: [PATCH 04/33] Translation Fix. --- modules/calendarview/controllers/calendarview.php | 10 +++++----- modules/calendarview/views/calendarview_year.html.php | 2 +- modules/calendarview/views/kohana_calendar.php | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/calendarview/controllers/calendarview.php b/modules/calendarview/controllers/calendarview.php index 45d847c2..e2790f00 100644 --- a/modules/calendarview/controllers/calendarview.php +++ b/modules/calendarview/controllers/calendarview.php @@ -112,7 +112,7 @@ class CalendarView_Controller extends Controller { $template->set_global("children_count", $day_count); $calendar_breadcrumbs[0] = new Calendar_Breadcrumb($display_year, url::site("calendarview/calendar/" . $display_year . "/" . $display_user)); - $calendar_breadcrumbs[1] = new Calendar_Breadcrumb(date("F", mktime(0, 0, 0, $display_month, $display_day, $display_year)), url::site("calendarview/month/" . $display_year . "/" . $display_user . "/" . $display_month)); + $calendar_breadcrumbs[1] = new Calendar_Breadcrumb(t(date("F", mktime(0, 0, 0, $display_month, $display_day, $display_year))), url::site("calendarview/month/" . $display_year . "/" . $display_user . "/" . $display_month)); $fake_item = new Calendar_Breadcrumb($display_day, ""); //$photo = ORM::factory("item", "3"); @@ -121,7 +121,7 @@ class CalendarView_Controller extends Controller { $template->content = new View("dynamic.html"); - $template->content->title = t("Photos From ") . date("d F Y", mktime(0, 0, 0, $display_month, $display_day, $display_year)); + $template->content->title = t("Photos From ") . date("d", mktime(0, 0, 0, $display_month, $display_day, $display_year)) . " " . t(date("F", mktime(0, 0, 0, $display_month, $display_day, $display_year))) . " " . date("Y", mktime(0, 0, 0, $display_month, $display_day, $display_year)); print $template; } @@ -167,7 +167,7 @@ class CalendarView_Controller extends Controller { $template->set_global("page_size", $page_size); $template->page_title = t("Gallery :: Calendar"); - $template->set_global("first_visible_position", $offset+1); + $template->set_global("first_visible_position", $offset+1); $template->set_global("last_visible_position", $offset+$page_size); // $template->set_global("total", $day_count); @@ -195,7 +195,7 @@ class CalendarView_Controller extends Controller { $template->set_global("children_count", $day_count); $calendar_breadcrumbs[0] = new Calendar_Breadcrumb($display_year, url::site("calendarview/calendar/" . $display_year . "/" . $display_user)); - $fake_item = new Calendar_Breadcrumb(date("F", mktime(0, 0, 0, $display_month, 1, $display_year)), ""); + $fake_item = new Calendar_Breadcrumb(t(date("F", mktime(0, 0, 0, $display_month, 1, $display_year))), ""); //$photo = ORM::factory("item", "3"); $template->set_global("item", $fake_item); @@ -203,7 +203,7 @@ class CalendarView_Controller extends Controller { $template->content = new View("dynamic.html"); - $template->content->title = t("Photos From ") . date("F Y", mktime(0, 0, 0, $display_month, 1, $display_year)); + $template->content->title = t("Photos From ") . t(date("F", mktime(0, 0, 0, $display_month, 1, $display_year))) . " " . date("Y", mktime(0, 0, 0, $display_month, 1, $display_year)); print $template; } diff --git a/modules/calendarview/views/calendarview_year.html.php b/modules/calendarview/views/calendarview_year.html.php index 59389d18..ff25dbff 100644 --- a/modules/calendarview/views/calendarview_year.html.php +++ b/modules/calendarview/views/calendarview_year.html.php @@ -1,6 +1,6 @@ -

+

 - + From 11153056f1f52eaa467a934c8e788305a73b854e Mon Sep 17 00:00:00 2001 From: rWatcher Date: Wed, 18 Nov 2009 19:04:47 -0500 Subject: [PATCH 05/33] Code cleanup. --- .../calendarview/controllers/calendarview.php | 28 +++++-------------- .../libraries/Calendar_Breadcrumb.php | 14 ++++------ 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/modules/calendarview/controllers/calendarview.php b/modules/calendarview/controllers/calendarview.php index e2790f00..457089fd 100644 --- a/modules/calendarview/controllers/calendarview.php +++ b/modules/calendarview/controllers/calendarview.php @@ -33,7 +33,7 @@ class CalendarView_Controller extends Controller { // Draw the page. $template = new Theme_View("page.html", "other", "CalendarView"); $template->css("calendarview_calendar.css"); - $template->set_global("calendar_user", $display_user); + $template->set_global("calendar_user", $display_user); $template->page_title = t("Gallery :: Calendar"); $template->content = new View("calendarview_year.html"); $template->content->calendar_year = $display_year; @@ -84,10 +84,6 @@ class CalendarView_Controller extends Controller { $template->set_global("page_size", $page_size); $template->page_title = t("Gallery :: Calendar"); - $template->set_global("first_visible_position", $offset+1); - $template->set_global("last_visible_position", $offset+$page_size); - // $template->set_global("total", $day_count); - // Figure out which photos go on this page. if ($display_user == "-1") { $template->set_global("children", ORM::factory("item") @@ -108,18 +104,15 @@ class CalendarView_Controller extends Controller { ->find_all($page_size, $offset)); } - // Finish setting up and then display the page. - $template->set_global("children_count", $day_count); - + // Set up breadcrumbs $calendar_breadcrumbs[0] = new Calendar_Breadcrumb($display_year, url::site("calendarview/calendar/" . $display_year . "/" . $display_user)); $calendar_breadcrumbs[1] = new Calendar_Breadcrumb(t(date("F", mktime(0, 0, 0, $display_month, $display_day, $display_year))), url::site("calendarview/month/" . $display_year . "/" . $display_user . "/" . $display_month)); $fake_item = new Calendar_Breadcrumb($display_day, ""); - - //$photo = ORM::factory("item", "3"); $template->set_global("item", $fake_item); $template->set_global("parents", $calendar_breadcrumbs); - + // Finish setting up and then display the page. + $template->set_global("children_count", $day_count); $template->content = new View("dynamic.html"); $template->content->title = t("Photos From ") . date("d", mktime(0, 0, 0, $display_month, $display_day, $display_year)) . " " . t(date("F", mktime(0, 0, 0, $display_month, $display_day, $display_year))) . " " . date("Y", mktime(0, 0, 0, $display_month, $display_day, $display_year)); print $template; @@ -167,10 +160,6 @@ class CalendarView_Controller extends Controller { $template->set_global("page_size", $page_size); $template->page_title = t("Gallery :: Calendar"); - $template->set_global("first_visible_position", $offset+1); - $template->set_global("last_visible_position", $offset+$page_size); - // $template->set_global("total", $day_count); - // Figure out which photos go on this page. if ($display_user == "-1") { $template->set_global("children", ORM::factory("item") @@ -191,17 +180,14 @@ class CalendarView_Controller extends Controller { ->find_all($page_size, $offset)); } - // Finish setting up and then display the page. - $template->set_global("children_count", $day_count); - + // Set up breadcrumbs for this page. $calendar_breadcrumbs[0] = new Calendar_Breadcrumb($display_year, url::site("calendarview/calendar/" . $display_year . "/" . $display_user)); $fake_item = new Calendar_Breadcrumb(t(date("F", mktime(0, 0, 0, $display_month, 1, $display_year))), ""); - - //$photo = ORM::factory("item", "3"); $template->set_global("item", $fake_item); $template->set_global("parents", $calendar_breadcrumbs); - + // Finish setting up and then display the page. + $template->set_global("children_count", $day_count); $template->content = new View("dynamic.html"); $template->content->title = t("Photos From ") . t(date("F", mktime(0, 0, 0, $display_month, 1, $display_year))) . " " . date("Y", mktime(0, 0, 0, $display_month, 1, $display_year)); print $template; diff --git a/modules/calendarview/libraries/Calendar_Breadcrumb.php b/modules/calendarview/libraries/Calendar_Breadcrumb.php index 954653c6..054311f1 100644 --- a/modules/calendarview/libraries/Calendar_Breadcrumb.php +++ b/modules/calendarview/libraries/Calendar_Breadcrumb.php @@ -18,27 +18,23 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ class Calendar_Breadcrumb_Core { - public $title = "the_title"; + // Creates a class to maintain a single breadcrumb. + // Multiple breadcrumbs can be achieved by createing an array of this class type. + public $title = ""; public $id = 0; - //public $crumb_url = "asdf"; - public $url = "asdf"; - public $crumb_parent = null; + public $url = ""; public function __construct($new_title, $new_url) { $this->title = $new_title; $this->url = $new_url; - //$this->crumb_url = $new_url; } public function url($query=null) { - //return $crumb_url; - //print $this->url; - //return "http://the.url/"; return $this->url; } public function parent() { - return $crumb_parent; + return null; } public function is_album() { From 8ca9f9e780bd4af1a23bd5a59b49e633d264be37 Mon Sep 17 00:00:00 2001 From: rWatcher Date: Thu, 19 Nov 2009 04:03:16 +0800 Subject: [PATCH 06/33] Added a month view and breadcrumbs to album view. --- .../calendarview/controllers/calendarview.php | 110 +++++++++++++++++- .../libraries/Calendar_Breadcrumb.php | 51 ++++++++ .../calendarview/views/kohana_calendar.php | 4 +- 3 files changed, 159 insertions(+), 6 deletions(-) create mode 100644 modules/calendarview/libraries/Calendar_Breadcrumb.php diff --git a/modules/calendarview/controllers/calendarview.php b/modules/calendarview/controllers/calendarview.php index 7351ad98..c0f34633 100644 --- a/modules/calendarview/controllers/calendarview.php +++ b/modules/calendarview/controllers/calendarview.php @@ -33,6 +33,7 @@ class CalendarView_Controller extends Controller { // Draw the page. $template = new Theme_View("page.html", "other", "CalendarView"); $template->css("calendarview_calendar.css"); + $template->set_global("calendar_user", $display_user); $template->page_title = t("Gallery :: Calendar"); $template->content = new View("calendarview_year.html"); $template->content->calendar_year = $display_year; @@ -45,6 +46,7 @@ class CalendarView_Controller extends Controller { // Display all images for the specified day. // Figure out the total number of photos to display. + $day_count = 0; if ($display_user == "-1") { $day_count = ORM::factory("item") ->viewable() @@ -66,19 +68,25 @@ class CalendarView_Controller extends Controller { // Figure out paging stuff. $page_size = module::get_var("gallery", "page_size", 9); - $page = $this->input->get("page", "1"); + $page = (int) $this->input->get("page", "1"); $offset = ($page-1) * $page_size; - $max_pages = ceil($day_count / $page_size); + $max_pages = max(ceil($day_count / $page_size), 1); // Make sure that the page references a valid offset - if ($page < 1 || ($day_count && $page > ceil($day_count / $page_size))) { + if (($page < 1) || ($page > $max_pages)) { Kohana::show_404(); } // Set up the page. - $template = new Theme_View("page.html", "other", "CalendarDayView"); - $template->page_title = t("Gallery :: Calendar"); + $template = new Theme_View("page.html", "collection", "CalendarDayView"); + $template->set_global("page", $page); + $template->set_global("max_pages", $max_pages); $template->set_global("page_size", $page_size); + $template->page_title = t("Gallery :: Calendar"); + + $template->set_global("first_visible_position", $offset+1); + $template->set_global("last_visible_position", $offset+$page_size); + // $template->set_global("total", $day_count); // Figure out which photos go on this page. if ($display_user == "-1") { @@ -102,11 +110,103 @@ class CalendarView_Controller extends Controller { // Finish setting up and then display the page. $template->set_global("children_count", $day_count); + + $calendar_breadcrumbs[0] = new Calendar_Breadcrumb($display_year, url::site("calendarview/calendar/" . $display_year . "/" . $display_user)); + $calendar_breadcrumbs[1] = new Calendar_Breadcrumb(date("F", mktime(0, 0, 0, $display_month, $display_day, $display_year)), url::site("calendarview/month/" . $display_year . "/" . $display_user . "/" . $display_month)); + $fake_item = new Calendar_Breadcrumb($display_day, ""); + + //$photo = ORM::factory("item", "3"); + $template->set_global("item", $fake_item); + $template->set_global("parents", $calendar_breadcrumbs); + + $template->content = new View("dynamic.html"); $template->content->title = t("Photos From ") . date("d F Y", mktime(0, 0, 0, $display_month, $display_day, $display_year)); print $template; } + public function month($display_year, $display_user, $display_month) { + // Display all images for the specified month. + + // Figure out the total number of photos to display. + $day_count = 0; + if ($display_user == "-1") { + $day_count = ORM::factory("item") + ->viewable() + ->where("type !=", "album") + ->where("captured >=", mktime(0, 0, 0, $display_month, 1, $display_year)) + ->where("captured <", mktime(0, 0, 0, $display_month+1, 1, $display_year)) + ->find_all() + ->count(); + } else { + $day_count = ORM::factory("item") + ->viewable() + ->where("owner_id", $display_user) + ->where("type !=", "album") + ->where("captured >=", mktime(0, 0, 0, $display_month, 1, $display_year)) + ->where("captured <", mktime(0, 0, 0, $display_month+1, 1, $display_year)) + ->find_all() + ->count(); + } + + // Figure out paging stuff. + $page_size = module::get_var("gallery", "page_size", 9); + $page = (int) $this->input->get("page", "1"); + $offset = ($page-1) * $page_size; + $max_pages = max(ceil($day_count / $page_size), 1); + + // Make sure that the page references a valid offset + if (($page < 1) || ($page > $max_pages)) { + Kohana::show_404(); + } + + // Set up the page. + $template = new Theme_View("page.html", "collection", "CalendarMonthView"); + $template->set_global("page", $page); + $template->set_global("max_pages", $max_pages); + $template->set_global("page_size", $page_size); + $template->page_title = t("Gallery :: Calendar"); + + $template->set_global("first_visible_position", $offset+1); + $template->set_global("last_visible_position", $offset+$page_size); + // $template->set_global("total", $day_count); + + // Figure out which photos go on this page. + if ($display_user == "-1") { + $template->set_global("children", ORM::factory("item") + ->viewable() + ->where("type !=", "album") + ->where("captured >=", mktime(0, 0, 0, $display_month, 1, $display_year)) + ->where("captured <", mktime(0, 0, 0, $display_month+1, 1, $display_year)) + ->orderby("captured", "ASC") + ->find_all($page_size, $offset)); + } else { + $template->set_global("children", ORM::factory("item") + ->viewable() + ->where("owner_id", $display_user) + ->where("type !=", "album") + ->where("captured >=", mktime(0, 0, 0, $display_month, 1, $display_year)) + ->where("captured <", mktime(0, 0, 0, $display_month+1, 1, $display_year)) + ->orderby("captured", "ASC") + ->find_all($page_size, $offset)); + } + + // Finish setting up and then display the page. + $template->set_global("children_count", $day_count); + + $calendar_breadcrumbs[0] = new Calendar_Breadcrumb($display_year, url::site("calendarview/calendar/" . $display_year . "/" . $display_user)); + $fake_item = new Calendar_Breadcrumb(date("F", mktime(0, 0, 0, $display_month, 1, $display_year)), ""); + + //$photo = ORM::factory("item", "3"); + $template->set_global("item", $fake_item); + $template->set_global("parents", $calendar_breadcrumbs); + + + $template->content = new View("dynamic.html"); + $template->content->title = t("Photos From ") . date("F Y", mktime(0, 0, 0, $display_month, 1, $display_year)); + print $template; + } + private function _get_calenderprefs_form($display_year, $display_user) { // Generate a form to allow the visitor to select a year and a gallery photo owner. $form = new Forge("calendarview/setprefs", "", "post", diff --git a/modules/calendarview/libraries/Calendar_Breadcrumb.php b/modules/calendarview/libraries/Calendar_Breadcrumb.php new file mode 100644 index 00000000..954653c6 --- /dev/null +++ b/modules/calendarview/libraries/Calendar_Breadcrumb.php @@ -0,0 +1,51 @@ +title = $new_title; + $this->url = $new_url; + //$this->crumb_url = $new_url; + } + + public function url($query=null) { + //return $crumb_url; + //print $this->url; + //return "http://the.url/"; + return $this->url; + } + + public function parent() { + return $crumb_parent; + } + + public function is_album() { + return false; + } + + public function is_photo() { + return false; + } +} diff --git a/modules/calendarview/views/kohana_calendar.php b/modules/calendarview/views/kohana_calendar.php index ff510658..8eafa2f8 100644 --- a/modules/calendarview/views/kohana_calendar.php +++ b/modules/calendarview/views/kohana_calendar.php @@ -18,7 +18,9 @@ $next = Router::$current_uri.'?'.http_build_query(array_merge($qs, array('month' ?>
+"> +
-"> +">
- + From 6547d54e72b769518a06ea2bc7bb955d9b01efea Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Thu, 26 Nov 2009 11:21:51 -0800 Subject: [PATCH 07/33] Fix a blown merge and bring calendarview up to date with rWatcher's changes. --- .../calendarview/controllers/calendarview.php | 92 ------------------- 1 file changed, 92 deletions(-) diff --git a/modules/calendarview/controllers/calendarview.php b/modules/calendarview/controllers/calendarview.php index ae597b60..457089fd 100644 --- a/modules/calendarview/controllers/calendarview.php +++ b/modules/calendarview/controllers/calendarview.php @@ -188,103 +188,11 @@ class CalendarView_Controller extends Controller { // Finish setting up and then display the page. $template->set_global("children_count", $day_count); - - $calendar_breadcrumbs[0] = new Calendar_Breadcrumb($display_year, url::site("calendarview/calendar/" . $display_year . "/" . $display_user)); - $calendar_breadcrumbs[1] = new Calendar_Breadcrumb(date("F", mktime(0, 0, 0, $display_month, $display_day, $display_year)), url::site("calendarview/month/" . $display_year . "/" . $display_user . "/" . $display_month)); - $fake_item = new Calendar_Breadcrumb($display_day, ""); - - //$photo = ORM::factory("item", "3"); - $template->set_global("item", $fake_item); - $template->set_global("parents", $calendar_breadcrumbs); - - $template->content = new View("dynamic.html"); $template->content->title = t("Photos From ") . t(date("F", mktime(0, 0, 0, $display_month, 1, $display_year))) . " " . date("Y", mktime(0, 0, 0, $display_month, 1, $display_year)); print $template; } - public function month($display_year, $display_user, $display_month) { - // Display all images for the specified month. - - // Figure out the total number of photos to display. - $day_count = 0; - if ($display_user == "-1") { - $day_count = ORM::factory("item") - ->viewable() - ->where("type !=", "album") - ->where("captured >=", mktime(0, 0, 0, $display_month, 1, $display_year)) - ->where("captured <", mktime(0, 0, 0, $display_month+1, 1, $display_year)) - ->find_all() - ->count(); - } else { - $day_count = ORM::factory("item") - ->viewable() - ->where("owner_id", $display_user) - ->where("type !=", "album") - ->where("captured >=", mktime(0, 0, 0, $display_month, 1, $display_year)) - ->where("captured <", mktime(0, 0, 0, $display_month+1, 1, $display_year)) - ->find_all() - ->count(); - } - - // Figure out paging stuff. - $page_size = module::get_var("gallery", "page_size", 9); - $page = (int) $this->input->get("page", "1"); - $offset = ($page-1) * $page_size; - $max_pages = max(ceil($day_count / $page_size), 1); - - // Make sure that the page references a valid offset - if (($page < 1) || ($page > $max_pages)) { - Kohana::show_404(); - } - - // Set up the page. - $template = new Theme_View("page.html", "collection", "CalendarMonthView"); - $template->set_global("page", $page); - $template->set_global("max_pages", $max_pages); - $template->set_global("page_size", $page_size); - $template->page_title = t("Gallery :: Calendar"); - - $template->set_global("first_visible_position", $offset+1); - $template->set_global("last_visible_position", $offset+$page_size); - // $template->set_global("total", $day_count); - - // Figure out which photos go on this page. - if ($display_user == "-1") { - $template->set_global("children", ORM::factory("item") - ->viewable() - ->where("type !=", "album") - ->where("captured >=", mktime(0, 0, 0, $display_month, 1, $display_year)) - ->where("captured <", mktime(0, 0, 0, $display_month+1, 1, $display_year)) - ->orderby("captured", "ASC") - ->find_all($page_size, $offset)); - } else { - $template->set_global("children", ORM::factory("item") - ->viewable() - ->where("owner_id", $display_user) - ->where("type !=", "album") - ->where("captured >=", mktime(0, 0, 0, $display_month, 1, $display_year)) - ->where("captured <", mktime(0, 0, 0, $display_month+1, 1, $display_year)) - ->orderby("captured", "ASC") - ->find_all($page_size, $offset)); - } - - // Finish setting up and then display the page. - $template->set_global("children_count", $day_count); - - $calendar_breadcrumbs[0] = new Calendar_Breadcrumb($display_year, url::site("calendarview/calendar/" . $display_year . "/" . $display_user)); - $fake_item = new Calendar_Breadcrumb(date("F", mktime(0, 0, 0, $display_month, 1, $display_year)), ""); - - //$photo = ORM::factory("item", "3"); - $template->set_global("item", $fake_item); - $template->set_global("parents", $calendar_breadcrumbs); - - - $template->content = new View("dynamic.html"); - $template->content->title = t("Photos From ") . date("F Y", mktime(0, 0, 0, $display_month, 1, $display_year)); - print $template; - } - private function _get_calenderprefs_form($display_year, $display_user) { // Generate a form to allow the visitor to select a year and a gallery photo owner. $form = new Forge("calendarview/setprefs", "", "post", From 937b4cb99d0f8cb72d4f4192ae248f48b284c916 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 27 Nov 2009 14:41:47 -0800 Subject: [PATCH 08/33] Restructure the 3nids theme into a more standard layout. Delete the tagsmap module with the expectation that any changes/additions will be merged into the existing tagsmap module. --- themes/{3nids_theme => 3nids}/README | 19 +- .../controllers/admin_theme_3nids.php | 0 .../controllers/comments_3nids.php | 0 .../controllers/movie_3nids.php | 0 .../controllers/photo_3nids.php | 0 themes/{3nids_theme => }/3nids/css/3nids.css | 0 themes/{3nids_theme => }/3nids/css/fix-ie.css | 0 .../3nids/css/jquery.fancybox.css | 0 themes/{3nids_theme => }/3nids/css/screen.css | 0 .../images/ui-bg_flat_0_333333_40x100.png | Bin .../images/ui-bg_flat_0_484848_40x100.png | Bin .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin .../images/ui-bg_flat_100_000000_40x100.png | Bin .../images/ui-bg_flat_100_333333_40x100.png | Bin .../images/ui-bg_flat_100_484848_40x100.png | Bin .../images/ui-bg_flat_100_b30000_40x100.png | Bin .../images/ui-bg_flat_55_fbec88_40x100.png | Bin .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin .../ui-bg_gloss-wave_16_121212_500x100.png | Bin .../ui-bg_highlight-hard_100_333333_1x100.png | Bin .../ui-bg_highlight-hard_15_888888_1x100.png | Bin .../ui-bg_highlight-hard_55_555555_1x100.png | Bin .../ui-bg_highlight-soft_35_adadad_1x100.png | Bin .../ui-bg_highlight-soft_60_dddddd_1x100.png | Bin .../ui-bg_inset-soft_15_121212_1x100.png | Bin .../images/ui-icons_222222_256x240.png | Bin .../images/ui-icons_333333_256x240.png | Bin .../images/ui-icons_444444_256x240.png | Bin .../images/ui-icons_666666_256x240.png | Bin .../images/ui-icons_aaaaaa_256x240.png | Bin .../images/ui-icons_bbbbbb_256x240.png | Bin .../images/ui-icons_cccccc_256x240.png | Bin .../images/ui-icons_cd0a0a_256x240.png | Bin .../images/ui-icons_f9bd01_256x240.png | Bin .../images/ui-icons_f9db01_256x240.png | Bin .../3nids/css/themeroller/ui.base.css | 0 .../helpers/comment_3nids.php | 0 .../helpers/theme_3nids.php | 0 .../helpers/theme_3nids_event.php | 0 .../helpers/theme_3nids_theme.php | 0 .../{3nids_theme => }/3nids/images/avatar.jpg | Bin .../3nids/images/fancy_closebox.png | Bin .../3nids/images/fancy_left.png | Bin .../3nids/images/fancy_progress.png | Bin .../3nids/images/fancy_right.png | Bin .../3nids/images/fancy_shadow_e.png | Bin .../3nids/images/fancy_shadow_n.png | Bin .../3nids/images/fancy_shadow_ne.png | Bin .../3nids/images/fancy_shadow_nw.png | Bin .../3nids/images/fancy_shadow_s.png | Bin .../3nids/images/fancy_shadow_se.png | Bin .../3nids/images/fancy_shadow_sw.png | Bin .../3nids/images/fancy_shadow_w.png | Bin .../3nids/images/fancy_title_left.png | Bin .../3nids/images/fancy_title_main.png | Bin .../3nids/images/fancy_title_right.png | Bin .../3nids/images/ico-album.png | Bin .../3nids/images/ico-help.png | Bin .../3nids/images/ico-print.png | Bin .../3nids/images/ico-view-comments.png | Bin .../3nids/images/ico-view-fullsize.png | Bin .../3nids/images/ico-view-slideshow.png | Bin themes/{3nids_theme => }/3nids/images/map.png | Bin .../3nids/images/select-photos-backg.png | Bin .../3nids/js/jquery.easing.js | 0 .../3nids/js/jquery.fancybox.js | 0 themes/{3nids_theme => }/3nids/js/ui.init.js | 0 themes/{3nids_theme => }/3nids/theme.info | 0 themes/{3nids_theme => }/3nids/thumbnail.png | Bin .../views/admin_theme_3nids.html.php | 0 .../3nids/views/album.html.php | 0 .../3nids/views/block.html.php | 0 .../3nids/views/comments.html.php | 0 .../3nids/views/dynamic.html.php | 0 .../3nids/views/exif_dialog.html.php | 0 .../3nids/views/image_block_block.html.php | 0 .../3nids/views/movie.html.php | 0 .../3nids/views/movie_3nids.html.php | 0 .../3nids/views/no_sidebar.html.php | 0 .../3nids/views/page.html.php | 0 .../3nids/views/pager.html.php | 0 .../3nids/views/photo.html.php | 0 .../3nids/views/photo_3nids.html.php | 0 .../3nids/views/search.html.php | 0 .../3nids/views/sidebar.html.php | 0 themes/3nids_theme/last_commit.txt | 1 - .../tagsmap/controllers/admin_tagsmap.php | 238 ------- .../modules/tagsmap/controllers/tagsmap.php | 62 -- .../modules/tagsmap/css/tagsmap.css | 97 --- .../modules/tagsmap/helpers/tagsmap.php | 39 -- .../modules/tagsmap/helpers/tagsmap_event.php | 43 -- .../tagsmap/helpers/tagsmap_installer.php | 48 -- .../modules/tagsmap/helpers/tagsmap_theme.php | 24 - .../modules/tagsmap/images/gmInfo_b.png | Bin 2800 -> 0 bytes .../modules/tagsmap/images/gmInfo_beak.png | Bin 2950 -> 0 bytes .../modules/tagsmap/images/gmInfo_bl.png | Bin 2871 -> 0 bytes .../modules/tagsmap/images/gmInfo_br.png | Bin 2867 -> 0 bytes .../modules/tagsmap/images/gmInfo_close.png | Bin 4096 -> 0 bytes .../modules/tagsmap/images/gmInfo_l.png | Bin 2801 -> 0 bytes .../modules/tagsmap/images/gmInfo_r.png | Bin 2800 -> 0 bytes .../modules/tagsmap/images/gmInfo_t.png | Bin 2805 -> 0 bytes .../modules/tagsmap/images/gmInfo_tl.png | Bin 2861 -> 0 bytes .../modules/tagsmap/images/gmInfo_tr.png | Bin 2877 -> 0 bytes .../modules/tagsmap/images/landscape16.png | Bin 3713 -> 0 bytes .../modules/tagsmap/images/marker_shadow.png | Bin 436 -> 0 bytes .../modules/tagsmap/images/markero.png | Bin 605 -> 0 bytes .../modules/tagsmap/images/markery.png | Bin 604 -> 0 bytes .../modules/tagsmap/js/extinfowindow.js | 610 ------------------ .../modules/tagsmap/models/tags_gps.php | 21 - .../3nids_theme/modules/tagsmap/module.info | 3 - .../tagsmap/views/admin_tagsmap.html.php | 88 --- .../views/admin_tagsmap_delete.html.php | 9 - .../tagsmap/views/admin_tagsmap_edit.html.php | 56 -- .../tagsmap/views/tagsmap_googlemap.html.php | 143 ---- .../modules/theme_3nids/module.info | 3 - 115 files changed, 9 insertions(+), 1495 deletions(-) rename themes/{3nids_theme => 3nids}/README (63%) rename themes/{3nids_theme/modules/theme_3nids => 3nids}/controllers/admin_theme_3nids.php (100%) rename themes/{3nids_theme/modules/theme_3nids => 3nids}/controllers/comments_3nids.php (100%) rename themes/{3nids_theme/modules/theme_3nids => 3nids}/controllers/movie_3nids.php (100%) rename themes/{3nids_theme/modules/theme_3nids => 3nids}/controllers/photo_3nids.php (100%) rename themes/{3nids_theme => }/3nids/css/3nids.css (100%) rename themes/{3nids_theme => }/3nids/css/fix-ie.css (100%) rename themes/{3nids_theme => }/3nids/css/jquery.fancybox.css (100%) rename themes/{3nids_theme => }/3nids/css/screen.css (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-bg_flat_0_333333_40x100.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-bg_flat_0_484848_40x100.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-bg_flat_0_aaaaaa_40x100.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-bg_flat_100_000000_40x100.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-bg_flat_100_333333_40x100.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-bg_flat_100_484848_40x100.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-bg_flat_100_b30000_40x100.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-bg_flat_55_fbec88_40x100.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-bg_glass_95_fef1ec_1x400.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-bg_gloss-wave_16_121212_500x100.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-bg_highlight-hard_100_333333_1x100.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-bg_highlight-hard_15_888888_1x100.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-bg_highlight-hard_55_555555_1x100.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-bg_highlight-soft_35_adadad_1x100.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-bg_highlight-soft_60_dddddd_1x100.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-bg_inset-soft_15_121212_1x100.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-icons_222222_256x240.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-icons_333333_256x240.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-icons_444444_256x240.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-icons_666666_256x240.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-icons_aaaaaa_256x240.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-icons_bbbbbb_256x240.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-icons_cccccc_256x240.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-icons_cd0a0a_256x240.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-icons_f9bd01_256x240.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/images/ui-icons_f9db01_256x240.png (100%) rename themes/{3nids_theme => }/3nids/css/themeroller/ui.base.css (100%) rename themes/{3nids_theme/modules/theme_3nids => 3nids}/helpers/comment_3nids.php (100%) rename themes/{3nids_theme/modules/theme_3nids => 3nids}/helpers/theme_3nids.php (100%) rename themes/{3nids_theme/modules/theme_3nids => 3nids}/helpers/theme_3nids_event.php (100%) rename themes/{3nids_theme/modules/theme_3nids => 3nids}/helpers/theme_3nids_theme.php (100%) rename themes/{3nids_theme => }/3nids/images/avatar.jpg (100%) rename themes/{3nids_theme => }/3nids/images/fancy_closebox.png (100%) rename themes/{3nids_theme => }/3nids/images/fancy_left.png (100%) rename themes/{3nids_theme => }/3nids/images/fancy_progress.png (100%) rename themes/{3nids_theme => }/3nids/images/fancy_right.png (100%) rename themes/{3nids_theme => }/3nids/images/fancy_shadow_e.png (100%) rename themes/{3nids_theme => }/3nids/images/fancy_shadow_n.png (100%) rename themes/{3nids_theme => }/3nids/images/fancy_shadow_ne.png (100%) rename themes/{3nids_theme => }/3nids/images/fancy_shadow_nw.png (100%) rename themes/{3nids_theme => }/3nids/images/fancy_shadow_s.png (100%) rename themes/{3nids_theme => }/3nids/images/fancy_shadow_se.png (100%) rename themes/{3nids_theme => }/3nids/images/fancy_shadow_sw.png (100%) rename themes/{3nids_theme => }/3nids/images/fancy_shadow_w.png (100%) rename themes/{3nids_theme => }/3nids/images/fancy_title_left.png (100%) rename themes/{3nids_theme => }/3nids/images/fancy_title_main.png (100%) rename themes/{3nids_theme => }/3nids/images/fancy_title_right.png (100%) rename themes/{3nids_theme => }/3nids/images/ico-album.png (100%) rename themes/{3nids_theme => }/3nids/images/ico-help.png (100%) rename themes/{3nids_theme => }/3nids/images/ico-print.png (100%) rename themes/{3nids_theme => }/3nids/images/ico-view-comments.png (100%) rename themes/{3nids_theme => }/3nids/images/ico-view-fullsize.png (100%) rename themes/{3nids_theme => }/3nids/images/ico-view-slideshow.png (100%) rename themes/{3nids_theme => }/3nids/images/map.png (100%) rename themes/{3nids_theme => }/3nids/images/select-photos-backg.png (100%) rename themes/{3nids_theme => }/3nids/js/jquery.easing.js (100%) rename themes/{3nids_theme => }/3nids/js/jquery.fancybox.js (100%) rename themes/{3nids_theme => }/3nids/js/ui.init.js (100%) rename themes/{3nids_theme => }/3nids/theme.info (100%) rename themes/{3nids_theme => }/3nids/thumbnail.png (100%) rename themes/{3nids_theme/modules/theme_3nids => 3nids}/views/admin_theme_3nids.html.php (100%) rename themes/{3nids_theme => }/3nids/views/album.html.php (100%) rename themes/{3nids_theme => }/3nids/views/block.html.php (100%) rename themes/{3nids_theme => }/3nids/views/comments.html.php (100%) rename themes/{3nids_theme => }/3nids/views/dynamic.html.php (100%) rename themes/{3nids_theme => }/3nids/views/exif_dialog.html.php (100%) rename themes/{3nids_theme => }/3nids/views/image_block_block.html.php (100%) rename themes/{3nids_theme => }/3nids/views/movie.html.php (100%) rename themes/{3nids_theme => }/3nids/views/movie_3nids.html.php (100%) rename themes/{3nids_theme => }/3nids/views/no_sidebar.html.php (100%) rename themes/{3nids_theme => }/3nids/views/page.html.php (100%) rename themes/{3nids_theme => }/3nids/views/pager.html.php (100%) rename themes/{3nids_theme => }/3nids/views/photo.html.php (100%) rename themes/{3nids_theme => }/3nids/views/photo_3nids.html.php (100%) rename themes/{3nids_theme => }/3nids/views/search.html.php (100%) rename themes/{3nids_theme => }/3nids/views/sidebar.html.php (100%) delete mode 100755 themes/3nids_theme/last_commit.txt delete mode 100755 themes/3nids_theme/modules/tagsmap/controllers/admin_tagsmap.php delete mode 100755 themes/3nids_theme/modules/tagsmap/controllers/tagsmap.php delete mode 100755 themes/3nids_theme/modules/tagsmap/css/tagsmap.css delete mode 100755 themes/3nids_theme/modules/tagsmap/helpers/tagsmap.php delete mode 100755 themes/3nids_theme/modules/tagsmap/helpers/tagsmap_event.php delete mode 100755 themes/3nids_theme/modules/tagsmap/helpers/tagsmap_installer.php delete mode 100755 themes/3nids_theme/modules/tagsmap/helpers/tagsmap_theme.php delete mode 100755 themes/3nids_theme/modules/tagsmap/images/gmInfo_b.png delete mode 100755 themes/3nids_theme/modules/tagsmap/images/gmInfo_beak.png delete mode 100755 themes/3nids_theme/modules/tagsmap/images/gmInfo_bl.png delete mode 100755 themes/3nids_theme/modules/tagsmap/images/gmInfo_br.png delete mode 100755 themes/3nids_theme/modules/tagsmap/images/gmInfo_close.png delete mode 100755 themes/3nids_theme/modules/tagsmap/images/gmInfo_l.png delete mode 100755 themes/3nids_theme/modules/tagsmap/images/gmInfo_r.png delete mode 100755 themes/3nids_theme/modules/tagsmap/images/gmInfo_t.png delete mode 100755 themes/3nids_theme/modules/tagsmap/images/gmInfo_tl.png delete mode 100755 themes/3nids_theme/modules/tagsmap/images/gmInfo_tr.png delete mode 100755 themes/3nids_theme/modules/tagsmap/images/landscape16.png delete mode 100755 themes/3nids_theme/modules/tagsmap/images/marker_shadow.png delete mode 100755 themes/3nids_theme/modules/tagsmap/images/markero.png delete mode 100755 themes/3nids_theme/modules/tagsmap/images/markery.png delete mode 100755 themes/3nids_theme/modules/tagsmap/js/extinfowindow.js delete mode 100755 themes/3nids_theme/modules/tagsmap/models/tags_gps.php delete mode 100755 themes/3nids_theme/modules/tagsmap/module.info delete mode 100755 themes/3nids_theme/modules/tagsmap/views/admin_tagsmap.html.php delete mode 100755 themes/3nids_theme/modules/tagsmap/views/admin_tagsmap_delete.html.php delete mode 100755 themes/3nids_theme/modules/tagsmap/views/admin_tagsmap_edit.html.php delete mode 100755 themes/3nids_theme/modules/tagsmap/views/tagsmap_googlemap.html.php delete mode 100755 themes/3nids_theme/modules/theme_3nids/module.info diff --git a/themes/3nids_theme/README b/themes/3nids/README similarity index 63% rename from themes/3nids_theme/README rename to themes/3nids/README index 828c27dd..581b63fc 100755 --- a/themes/3nids_theme/README +++ b/themes/3nids/README @@ -1,22 +1,21 @@ This is a theme for gallery3. -It uses jquery lightbox slideshow (fancybox) to display images, and includes a tagsmap module (originally from rWatcher). +It uses jquery lightbox slideshow (fancybox) to display images. ********* -Demo @ http://gallery.3nids.ch +Demo @ http://gallery.3nids.ch ********* Requirements: -- Gallery 3 last experimental version @ http://github.com/gallery/gallery3 -- Tag module activated (if want to use tagsmap) -- theme_3nids module must be activated to display properly the theme. +- Gallery 3 last experimental version @ http://github.com/gallery/gallery3 +- Tag and tagsmap modules activated (optional) ********* Installation: 1. Copy the theme folder (3nids) into gallery3/themes directory. -2. Copy modules folder into gallery3 directory. It includes tagsmap and theme_3nids modules. -3. Activate tagsmap and theme_3nids module. - +2. Copy the tagsmap module into the gallery3/modules folder. +3. Activate tagsmap module and 3nids theme. + ********* Configuration: Go to admin -> content -> Theme 3nids settings to configure the theme properly. @@ -24,7 +23,7 @@ Go to admin -> content -> Theme 3nids settings to configure the theme properly. ********* Use: This theme displays full size images. So be carefull to upload not too large images! -The theme uses the tagsmap module which has been enhanced. +The theme optionally uses the tagsmap module. For advanced users: If you want to separate geotag from others, name those with the "map." prefix., the "map." prefix will not be displayed on the map. @@ -33,6 +32,6 @@ If you want to remove the prefix in the tag cloud sidebar, wou will have to upda return ORM::factory("tag") ->orderby("count", "DESC") ->notregex("name","map\.") - ->limit($count) + ->limit($count) ->find_all(); } diff --git a/themes/3nids_theme/modules/theme_3nids/controllers/admin_theme_3nids.php b/themes/3nids/controllers/admin_theme_3nids.php similarity index 100% rename from themes/3nids_theme/modules/theme_3nids/controllers/admin_theme_3nids.php rename to themes/3nids/controllers/admin_theme_3nids.php diff --git a/themes/3nids_theme/modules/theme_3nids/controllers/comments_3nids.php b/themes/3nids/controllers/comments_3nids.php similarity index 100% rename from themes/3nids_theme/modules/theme_3nids/controllers/comments_3nids.php rename to themes/3nids/controllers/comments_3nids.php diff --git a/themes/3nids_theme/modules/theme_3nids/controllers/movie_3nids.php b/themes/3nids/controllers/movie_3nids.php similarity index 100% rename from themes/3nids_theme/modules/theme_3nids/controllers/movie_3nids.php rename to themes/3nids/controllers/movie_3nids.php diff --git a/themes/3nids_theme/modules/theme_3nids/controllers/photo_3nids.php b/themes/3nids/controllers/photo_3nids.php similarity index 100% rename from themes/3nids_theme/modules/theme_3nids/controllers/photo_3nids.php rename to themes/3nids/controllers/photo_3nids.php diff --git a/themes/3nids_theme/3nids/css/3nids.css b/themes/3nids/css/3nids.css similarity index 100% rename from themes/3nids_theme/3nids/css/3nids.css rename to themes/3nids/css/3nids.css diff --git a/themes/3nids_theme/3nids/css/fix-ie.css b/themes/3nids/css/fix-ie.css similarity index 100% rename from themes/3nids_theme/3nids/css/fix-ie.css rename to themes/3nids/css/fix-ie.css diff --git a/themes/3nids_theme/3nids/css/jquery.fancybox.css b/themes/3nids/css/jquery.fancybox.css similarity index 100% rename from themes/3nids_theme/3nids/css/jquery.fancybox.css rename to themes/3nids/css/jquery.fancybox.css diff --git a/themes/3nids_theme/3nids/css/screen.css b/themes/3nids/css/screen.css similarity index 100% rename from themes/3nids_theme/3nids/css/screen.css rename to themes/3nids/css/screen.css diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-bg_flat_0_333333_40x100.png b/themes/3nids/css/themeroller/images/ui-bg_flat_0_333333_40x100.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-bg_flat_0_333333_40x100.png rename to themes/3nids/css/themeroller/images/ui-bg_flat_0_333333_40x100.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-bg_flat_0_484848_40x100.png b/themes/3nids/css/themeroller/images/ui-bg_flat_0_484848_40x100.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-bg_flat_0_484848_40x100.png rename to themes/3nids/css/themeroller/images/ui-bg_flat_0_484848_40x100.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-bg_flat_0_aaaaaa_40x100.png b/themes/3nids/css/themeroller/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-bg_flat_0_aaaaaa_40x100.png rename to themes/3nids/css/themeroller/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-bg_flat_100_000000_40x100.png b/themes/3nids/css/themeroller/images/ui-bg_flat_100_000000_40x100.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-bg_flat_100_000000_40x100.png rename to themes/3nids/css/themeroller/images/ui-bg_flat_100_000000_40x100.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-bg_flat_100_333333_40x100.png b/themes/3nids/css/themeroller/images/ui-bg_flat_100_333333_40x100.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-bg_flat_100_333333_40x100.png rename to themes/3nids/css/themeroller/images/ui-bg_flat_100_333333_40x100.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-bg_flat_100_484848_40x100.png b/themes/3nids/css/themeroller/images/ui-bg_flat_100_484848_40x100.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-bg_flat_100_484848_40x100.png rename to themes/3nids/css/themeroller/images/ui-bg_flat_100_484848_40x100.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-bg_flat_100_b30000_40x100.png b/themes/3nids/css/themeroller/images/ui-bg_flat_100_b30000_40x100.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-bg_flat_100_b30000_40x100.png rename to themes/3nids/css/themeroller/images/ui-bg_flat_100_b30000_40x100.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-bg_flat_55_fbec88_40x100.png b/themes/3nids/css/themeroller/images/ui-bg_flat_55_fbec88_40x100.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-bg_flat_55_fbec88_40x100.png rename to themes/3nids/css/themeroller/images/ui-bg_flat_55_fbec88_40x100.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-bg_glass_95_fef1ec_1x400.png b/themes/3nids/css/themeroller/images/ui-bg_glass_95_fef1ec_1x400.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-bg_glass_95_fef1ec_1x400.png rename to themes/3nids/css/themeroller/images/ui-bg_glass_95_fef1ec_1x400.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-bg_gloss-wave_16_121212_500x100.png b/themes/3nids/css/themeroller/images/ui-bg_gloss-wave_16_121212_500x100.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-bg_gloss-wave_16_121212_500x100.png rename to themes/3nids/css/themeroller/images/ui-bg_gloss-wave_16_121212_500x100.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-bg_highlight-hard_100_333333_1x100.png b/themes/3nids/css/themeroller/images/ui-bg_highlight-hard_100_333333_1x100.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-bg_highlight-hard_100_333333_1x100.png rename to themes/3nids/css/themeroller/images/ui-bg_highlight-hard_100_333333_1x100.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-bg_highlight-hard_15_888888_1x100.png b/themes/3nids/css/themeroller/images/ui-bg_highlight-hard_15_888888_1x100.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-bg_highlight-hard_15_888888_1x100.png rename to themes/3nids/css/themeroller/images/ui-bg_highlight-hard_15_888888_1x100.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-bg_highlight-hard_55_555555_1x100.png b/themes/3nids/css/themeroller/images/ui-bg_highlight-hard_55_555555_1x100.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-bg_highlight-hard_55_555555_1x100.png rename to themes/3nids/css/themeroller/images/ui-bg_highlight-hard_55_555555_1x100.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-bg_highlight-soft_35_adadad_1x100.png b/themes/3nids/css/themeroller/images/ui-bg_highlight-soft_35_adadad_1x100.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-bg_highlight-soft_35_adadad_1x100.png rename to themes/3nids/css/themeroller/images/ui-bg_highlight-soft_35_adadad_1x100.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-bg_highlight-soft_60_dddddd_1x100.png b/themes/3nids/css/themeroller/images/ui-bg_highlight-soft_60_dddddd_1x100.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-bg_highlight-soft_60_dddddd_1x100.png rename to themes/3nids/css/themeroller/images/ui-bg_highlight-soft_60_dddddd_1x100.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-bg_inset-soft_15_121212_1x100.png b/themes/3nids/css/themeroller/images/ui-bg_inset-soft_15_121212_1x100.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-bg_inset-soft_15_121212_1x100.png rename to themes/3nids/css/themeroller/images/ui-bg_inset-soft_15_121212_1x100.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-icons_222222_256x240.png b/themes/3nids/css/themeroller/images/ui-icons_222222_256x240.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-icons_222222_256x240.png rename to themes/3nids/css/themeroller/images/ui-icons_222222_256x240.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-icons_333333_256x240.png b/themes/3nids/css/themeroller/images/ui-icons_333333_256x240.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-icons_333333_256x240.png rename to themes/3nids/css/themeroller/images/ui-icons_333333_256x240.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-icons_444444_256x240.png b/themes/3nids/css/themeroller/images/ui-icons_444444_256x240.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-icons_444444_256x240.png rename to themes/3nids/css/themeroller/images/ui-icons_444444_256x240.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-icons_666666_256x240.png b/themes/3nids/css/themeroller/images/ui-icons_666666_256x240.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-icons_666666_256x240.png rename to themes/3nids/css/themeroller/images/ui-icons_666666_256x240.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-icons_aaaaaa_256x240.png b/themes/3nids/css/themeroller/images/ui-icons_aaaaaa_256x240.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-icons_aaaaaa_256x240.png rename to themes/3nids/css/themeroller/images/ui-icons_aaaaaa_256x240.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-icons_bbbbbb_256x240.png b/themes/3nids/css/themeroller/images/ui-icons_bbbbbb_256x240.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-icons_bbbbbb_256x240.png rename to themes/3nids/css/themeroller/images/ui-icons_bbbbbb_256x240.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-icons_cccccc_256x240.png b/themes/3nids/css/themeroller/images/ui-icons_cccccc_256x240.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-icons_cccccc_256x240.png rename to themes/3nids/css/themeroller/images/ui-icons_cccccc_256x240.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-icons_cd0a0a_256x240.png b/themes/3nids/css/themeroller/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-icons_cd0a0a_256x240.png rename to themes/3nids/css/themeroller/images/ui-icons_cd0a0a_256x240.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-icons_f9bd01_256x240.png b/themes/3nids/css/themeroller/images/ui-icons_f9bd01_256x240.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-icons_f9bd01_256x240.png rename to themes/3nids/css/themeroller/images/ui-icons_f9bd01_256x240.png diff --git a/themes/3nids_theme/3nids/css/themeroller/images/ui-icons_f9db01_256x240.png b/themes/3nids/css/themeroller/images/ui-icons_f9db01_256x240.png similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/images/ui-icons_f9db01_256x240.png rename to themes/3nids/css/themeroller/images/ui-icons_f9db01_256x240.png diff --git a/themes/3nids_theme/3nids/css/themeroller/ui.base.css b/themes/3nids/css/themeroller/ui.base.css similarity index 100% rename from themes/3nids_theme/3nids/css/themeroller/ui.base.css rename to themes/3nids/css/themeroller/ui.base.css diff --git a/themes/3nids_theme/modules/theme_3nids/helpers/comment_3nids.php b/themes/3nids/helpers/comment_3nids.php similarity index 100% rename from themes/3nids_theme/modules/theme_3nids/helpers/comment_3nids.php rename to themes/3nids/helpers/comment_3nids.php diff --git a/themes/3nids_theme/modules/theme_3nids/helpers/theme_3nids.php b/themes/3nids/helpers/theme_3nids.php similarity index 100% rename from themes/3nids_theme/modules/theme_3nids/helpers/theme_3nids.php rename to themes/3nids/helpers/theme_3nids.php diff --git a/themes/3nids_theme/modules/theme_3nids/helpers/theme_3nids_event.php b/themes/3nids/helpers/theme_3nids_event.php similarity index 100% rename from themes/3nids_theme/modules/theme_3nids/helpers/theme_3nids_event.php rename to themes/3nids/helpers/theme_3nids_event.php diff --git a/themes/3nids_theme/modules/theme_3nids/helpers/theme_3nids_theme.php b/themes/3nids/helpers/theme_3nids_theme.php similarity index 100% rename from themes/3nids_theme/modules/theme_3nids/helpers/theme_3nids_theme.php rename to themes/3nids/helpers/theme_3nids_theme.php diff --git a/themes/3nids_theme/3nids/images/avatar.jpg b/themes/3nids/images/avatar.jpg similarity index 100% rename from themes/3nids_theme/3nids/images/avatar.jpg rename to themes/3nids/images/avatar.jpg diff --git a/themes/3nids_theme/3nids/images/fancy_closebox.png b/themes/3nids/images/fancy_closebox.png similarity index 100% rename from themes/3nids_theme/3nids/images/fancy_closebox.png rename to themes/3nids/images/fancy_closebox.png diff --git a/themes/3nids_theme/3nids/images/fancy_left.png b/themes/3nids/images/fancy_left.png similarity index 100% rename from themes/3nids_theme/3nids/images/fancy_left.png rename to themes/3nids/images/fancy_left.png diff --git a/themes/3nids_theme/3nids/images/fancy_progress.png b/themes/3nids/images/fancy_progress.png similarity index 100% rename from themes/3nids_theme/3nids/images/fancy_progress.png rename to themes/3nids/images/fancy_progress.png diff --git a/themes/3nids_theme/3nids/images/fancy_right.png b/themes/3nids/images/fancy_right.png similarity index 100% rename from themes/3nids_theme/3nids/images/fancy_right.png rename to themes/3nids/images/fancy_right.png diff --git a/themes/3nids_theme/3nids/images/fancy_shadow_e.png b/themes/3nids/images/fancy_shadow_e.png similarity index 100% rename from themes/3nids_theme/3nids/images/fancy_shadow_e.png rename to themes/3nids/images/fancy_shadow_e.png diff --git a/themes/3nids_theme/3nids/images/fancy_shadow_n.png b/themes/3nids/images/fancy_shadow_n.png similarity index 100% rename from themes/3nids_theme/3nids/images/fancy_shadow_n.png rename to themes/3nids/images/fancy_shadow_n.png diff --git a/themes/3nids_theme/3nids/images/fancy_shadow_ne.png b/themes/3nids/images/fancy_shadow_ne.png similarity index 100% rename from themes/3nids_theme/3nids/images/fancy_shadow_ne.png rename to themes/3nids/images/fancy_shadow_ne.png diff --git a/themes/3nids_theme/3nids/images/fancy_shadow_nw.png b/themes/3nids/images/fancy_shadow_nw.png similarity index 100% rename from themes/3nids_theme/3nids/images/fancy_shadow_nw.png rename to themes/3nids/images/fancy_shadow_nw.png diff --git a/themes/3nids_theme/3nids/images/fancy_shadow_s.png b/themes/3nids/images/fancy_shadow_s.png similarity index 100% rename from themes/3nids_theme/3nids/images/fancy_shadow_s.png rename to themes/3nids/images/fancy_shadow_s.png diff --git a/themes/3nids_theme/3nids/images/fancy_shadow_se.png b/themes/3nids/images/fancy_shadow_se.png similarity index 100% rename from themes/3nids_theme/3nids/images/fancy_shadow_se.png rename to themes/3nids/images/fancy_shadow_se.png diff --git a/themes/3nids_theme/3nids/images/fancy_shadow_sw.png b/themes/3nids/images/fancy_shadow_sw.png similarity index 100% rename from themes/3nids_theme/3nids/images/fancy_shadow_sw.png rename to themes/3nids/images/fancy_shadow_sw.png diff --git a/themes/3nids_theme/3nids/images/fancy_shadow_w.png b/themes/3nids/images/fancy_shadow_w.png similarity index 100% rename from themes/3nids_theme/3nids/images/fancy_shadow_w.png rename to themes/3nids/images/fancy_shadow_w.png diff --git a/themes/3nids_theme/3nids/images/fancy_title_left.png b/themes/3nids/images/fancy_title_left.png similarity index 100% rename from themes/3nids_theme/3nids/images/fancy_title_left.png rename to themes/3nids/images/fancy_title_left.png diff --git a/themes/3nids_theme/3nids/images/fancy_title_main.png b/themes/3nids/images/fancy_title_main.png similarity index 100% rename from themes/3nids_theme/3nids/images/fancy_title_main.png rename to themes/3nids/images/fancy_title_main.png diff --git a/themes/3nids_theme/3nids/images/fancy_title_right.png b/themes/3nids/images/fancy_title_right.png similarity index 100% rename from themes/3nids_theme/3nids/images/fancy_title_right.png rename to themes/3nids/images/fancy_title_right.png diff --git a/themes/3nids_theme/3nids/images/ico-album.png b/themes/3nids/images/ico-album.png similarity index 100% rename from themes/3nids_theme/3nids/images/ico-album.png rename to themes/3nids/images/ico-album.png diff --git a/themes/3nids_theme/3nids/images/ico-help.png b/themes/3nids/images/ico-help.png similarity index 100% rename from themes/3nids_theme/3nids/images/ico-help.png rename to themes/3nids/images/ico-help.png diff --git a/themes/3nids_theme/3nids/images/ico-print.png b/themes/3nids/images/ico-print.png similarity index 100% rename from themes/3nids_theme/3nids/images/ico-print.png rename to themes/3nids/images/ico-print.png diff --git a/themes/3nids_theme/3nids/images/ico-view-comments.png b/themes/3nids/images/ico-view-comments.png similarity index 100% rename from themes/3nids_theme/3nids/images/ico-view-comments.png rename to themes/3nids/images/ico-view-comments.png diff --git a/themes/3nids_theme/3nids/images/ico-view-fullsize.png b/themes/3nids/images/ico-view-fullsize.png similarity index 100% rename from themes/3nids_theme/3nids/images/ico-view-fullsize.png rename to themes/3nids/images/ico-view-fullsize.png diff --git a/themes/3nids_theme/3nids/images/ico-view-slideshow.png b/themes/3nids/images/ico-view-slideshow.png similarity index 100% rename from themes/3nids_theme/3nids/images/ico-view-slideshow.png rename to themes/3nids/images/ico-view-slideshow.png diff --git a/themes/3nids_theme/3nids/images/map.png b/themes/3nids/images/map.png similarity index 100% rename from themes/3nids_theme/3nids/images/map.png rename to themes/3nids/images/map.png diff --git a/themes/3nids_theme/3nids/images/select-photos-backg.png b/themes/3nids/images/select-photos-backg.png similarity index 100% rename from themes/3nids_theme/3nids/images/select-photos-backg.png rename to themes/3nids/images/select-photos-backg.png diff --git a/themes/3nids_theme/3nids/js/jquery.easing.js b/themes/3nids/js/jquery.easing.js similarity index 100% rename from themes/3nids_theme/3nids/js/jquery.easing.js rename to themes/3nids/js/jquery.easing.js diff --git a/themes/3nids_theme/3nids/js/jquery.fancybox.js b/themes/3nids/js/jquery.fancybox.js similarity index 100% rename from themes/3nids_theme/3nids/js/jquery.fancybox.js rename to themes/3nids/js/jquery.fancybox.js diff --git a/themes/3nids_theme/3nids/js/ui.init.js b/themes/3nids/js/ui.init.js similarity index 100% rename from themes/3nids_theme/3nids/js/ui.init.js rename to themes/3nids/js/ui.init.js diff --git a/themes/3nids_theme/3nids/theme.info b/themes/3nids/theme.info similarity index 100% rename from themes/3nids_theme/3nids/theme.info rename to themes/3nids/theme.info diff --git a/themes/3nids_theme/3nids/thumbnail.png b/themes/3nids/thumbnail.png similarity index 100% rename from themes/3nids_theme/3nids/thumbnail.png rename to themes/3nids/thumbnail.png diff --git a/themes/3nids_theme/modules/theme_3nids/views/admin_theme_3nids.html.php b/themes/3nids/views/admin_theme_3nids.html.php similarity index 100% rename from themes/3nids_theme/modules/theme_3nids/views/admin_theme_3nids.html.php rename to themes/3nids/views/admin_theme_3nids.html.php diff --git a/themes/3nids_theme/3nids/views/album.html.php b/themes/3nids/views/album.html.php similarity index 100% rename from themes/3nids_theme/3nids/views/album.html.php rename to themes/3nids/views/album.html.php diff --git a/themes/3nids_theme/3nids/views/block.html.php b/themes/3nids/views/block.html.php similarity index 100% rename from themes/3nids_theme/3nids/views/block.html.php rename to themes/3nids/views/block.html.php diff --git a/themes/3nids_theme/3nids/views/comments.html.php b/themes/3nids/views/comments.html.php similarity index 100% rename from themes/3nids_theme/3nids/views/comments.html.php rename to themes/3nids/views/comments.html.php diff --git a/themes/3nids_theme/3nids/views/dynamic.html.php b/themes/3nids/views/dynamic.html.php similarity index 100% rename from themes/3nids_theme/3nids/views/dynamic.html.php rename to themes/3nids/views/dynamic.html.php diff --git a/themes/3nids_theme/3nids/views/exif_dialog.html.php b/themes/3nids/views/exif_dialog.html.php similarity index 100% rename from themes/3nids_theme/3nids/views/exif_dialog.html.php rename to themes/3nids/views/exif_dialog.html.php diff --git a/themes/3nids_theme/3nids/views/image_block_block.html.php b/themes/3nids/views/image_block_block.html.php similarity index 100% rename from themes/3nids_theme/3nids/views/image_block_block.html.php rename to themes/3nids/views/image_block_block.html.php diff --git a/themes/3nids_theme/3nids/views/movie.html.php b/themes/3nids/views/movie.html.php similarity index 100% rename from themes/3nids_theme/3nids/views/movie.html.php rename to themes/3nids/views/movie.html.php diff --git a/themes/3nids_theme/3nids/views/movie_3nids.html.php b/themes/3nids/views/movie_3nids.html.php similarity index 100% rename from themes/3nids_theme/3nids/views/movie_3nids.html.php rename to themes/3nids/views/movie_3nids.html.php diff --git a/themes/3nids_theme/3nids/views/no_sidebar.html.php b/themes/3nids/views/no_sidebar.html.php similarity index 100% rename from themes/3nids_theme/3nids/views/no_sidebar.html.php rename to themes/3nids/views/no_sidebar.html.php diff --git a/themes/3nids_theme/3nids/views/page.html.php b/themes/3nids/views/page.html.php similarity index 100% rename from themes/3nids_theme/3nids/views/page.html.php rename to themes/3nids/views/page.html.php diff --git a/themes/3nids_theme/3nids/views/pager.html.php b/themes/3nids/views/pager.html.php similarity index 100% rename from themes/3nids_theme/3nids/views/pager.html.php rename to themes/3nids/views/pager.html.php diff --git a/themes/3nids_theme/3nids/views/photo.html.php b/themes/3nids/views/photo.html.php similarity index 100% rename from themes/3nids_theme/3nids/views/photo.html.php rename to themes/3nids/views/photo.html.php diff --git a/themes/3nids_theme/3nids/views/photo_3nids.html.php b/themes/3nids/views/photo_3nids.html.php similarity index 100% rename from themes/3nids_theme/3nids/views/photo_3nids.html.php rename to themes/3nids/views/photo_3nids.html.php diff --git a/themes/3nids_theme/3nids/views/search.html.php b/themes/3nids/views/search.html.php similarity index 100% rename from themes/3nids_theme/3nids/views/search.html.php rename to themes/3nids/views/search.html.php diff --git a/themes/3nids_theme/3nids/views/sidebar.html.php b/themes/3nids/views/sidebar.html.php similarity index 100% rename from themes/3nids_theme/3nids/views/sidebar.html.php rename to themes/3nids/views/sidebar.html.php diff --git a/themes/3nids_theme/last_commit.txt b/themes/3nids_theme/last_commit.txt deleted file mode 100755 index fb37b765..00000000 --- a/themes/3nids_theme/last_commit.txt +++ /dev/null @@ -1 +0,0 @@ -Admin config for item title \ No newline at end of file diff --git a/themes/3nids_theme/modules/tagsmap/controllers/admin_tagsmap.php b/themes/3nids_theme/modules/tagsmap/controllers/admin_tagsmap.php deleted file mode 100755 index 34ccf7bc..00000000 --- a/themes/3nids_theme/modules/tagsmap/controllers/admin_tagsmap.php +++ /dev/null @@ -1,238 +0,0 @@ -content = new View("admin_tagsmap.html"); - - // Generate a form for Google Maps Settings. - $view->content->googlemaps_form = $this->_get_googlemaps_form(); - - // Generate a list of tags to display. - $query = ORM::factory("tag"); - $view->content->tags = $query->orderby("name", "ASC")->find_all(); - - // Display the page. - print $view; - } - - public function edit_gps($tag_id) { - // Generate a new admin page to edit gps data for the tag specified by $tag_id. - - // Determine the name of the tag. - $tagName = ORM::factory("tag") - ->where("id", $tag_id) - ->find_all(); - - // Set up the admin page. - $view = new Admin_View("admin.html"); - $view->content = new View("admin_tagsmap_edit.html"); - $view->content->tagsmapedit_form = $this->_get_tagsgpsedit_form($tag_id); - $view->content->tag_name = $tagName[0]->name; - print $view; - } - - public function orphaned_tags() { - // Locate and delete any orphaned GPS data. - $int_deleted_records = 0; - - // Generate a list of all tags with GPS data. - $existingGPS = ORM::factory("tags_gps") - ->find_all(); - - // Loop through each record and see if a corresponding tag exists. - foreach ($existingGPS as $oneGPS) { - $oneTag = ORM::factory("tag") - ->where("id", $oneGPS->tag_id) - ->find_all(); - - // If the tag no longer exists then delete the record. - if (count($oneTag) == 0) { - // Delete the record. - ORM::factory("tags_gps") - ->where("tag_id", $oneGPS->tag_id) - ->delete_all(); - $int_deleted_records++; - } - } - - // Redirect back to the main screen and display a "success" message. - message::success($int_deleted_records . t(" Orphaned Record(s) have been deleted.")); - url::redirect("admin/tagsmap"); - } - - public function confirm_delete_gps($tag_id) { - // Make sure the user meant to hit the delete button. - $view = new Admin_View("admin.html"); - $view->content = new View("admin_tagsmap_delete.html"); - $view->content->tag_id = $tag_id; - - // Determine the name of the tag. - $tagName = ORM::factory("tag") - ->where("id", $tag_id) - ->find_all(); - $view->content->tag_name = $tagName[0]->name; - - print $view; - } - - public function delete_gps($tag_id) { - // Delete the GSP data associated with a tag. - - // Delete the record. - ORM::factory("tags_gps") - ->where("tag_id", $tag_id) - ->delete_all(); - - // Redirect back to the main screen and display a "success" message. - message::success(t("Your Settings Have Been Saved.")); - url::redirect("admin/tagsmap"); - } - - private function _get_tagsgpsedit_form($tag_id) { - // Make a new form for editing GPS data associated with a tag ($tag_id). - $form = new Forge("admin/tagsmap/savegps", "", "post", - array("id" => "gTagsMapAdminForm")); - - // Add a few input boxes for GPS and Description - $tagsgps_group = $form->group("TagsMapGPS"); - $tagsgps_group->hidden("tag_id")->value($tag_id); - - // Check and see if this ID already has GPS data, then create - // input boxes to either update it or enter in new information. - $existingGPS = ORM::factory("tags_gps") - ->where("tag_id", $tag_id) - ->find_all(); - if (count($existingGPS) == 0) { - $tagsgps_group->input("gps_latitude")->label(t("Latitude"))->value(); - $tagsgps_group->input("gps_longitude")->label(t("Longitude"))->value(); - $tagsgps_group->textarea("gps_description")->label(t("Description"))->value(); - } else { - $tagsgps_group->input("gps_latitude")->label(t("Latitude"))->value($existingGPS[0]->latitude); - $tagsgps_group->input("gps_longitude")->label(t("Longitude"))->value($existingGPS[0]->longitude); - $tagsgps_group->textarea("gps_description")->label(t("Description"))->value($existingGPS[0]->description); - } - - // Add a save button to the form. - $tagsgps_group->submit("SaveGPS")->value(t("Save")); - - // Return the newly generated form. - return $form; - } - - public function savegps() { - // Save the GPS coordinates to the database. - - // Prevent Cross Site Request Forgery - access::verify_csrf(); - - // Figure out the values of the text boxes - $str_tagid = Input::instance()->post("tag_id"); - $str_latitude = Input::instance()->post("gps_latitude"); - $str_longitude = Input::instance()->post("gps_longitude"); - $str_description = Input::instance()->post("gps_description"); - - // Save to database. - // Check and see if this ID already has GPS data, - // Update it if it does, create a new record if it doesn't. - $existingGPS = ORM::factory("tags_gps") - ->where("tag_id", $str_tagid) - ->find_all(); - if (count($existingGPS) == 0) { - $newgps = ORM::factory("tags_gps"); - $newgps->tag_id = $str_tagid; - $newgps->latitude = $str_latitude; - $newgps->longitude = $str_longitude; - $newgps->description = $str_description; - $newgps->save(); - } else { - $updatedGPS = ORM::factory("tags_gps", $existingGPS[0]->id); - $updatedGPS->tag_id = $str_tagid; - $updatedGPS->latitude = $str_latitude; - $updatedGPS->longitude = $str_longitude; - $updatedGPS->description = $str_description; - $updatedGPS->save(); - } - - // Redirect back to the main screen and display a "success" message. - message::success(t("Your Settings Have Been Saved.")); - url::redirect("admin/tagsmap"); - } - - private function _get_googlemaps_form() { - // Make a new form for inputing information associated with google maps. - $form = new Forge("admin/tagsmap/savemapprefs", "", "post", - array("id" => "gTagsMapAdminForm")); - - // Input box for the Maps API Key - $googlemap_group = $form->group("GoogleMapsKey"); - $googlemap_group->input("google_api_key") - ->label(t("Google Maps API Key")) - ->value(module::get_var("tagsmap", "googlemap_api_key")); - - // Input boxes for the Maps starting location map type and zoom. - $startingmap_group = $form->group("GoogleMapsPos"); - $startingmap_group->input("google_starting_latitude") - ->label(t("Starting Latitude")) - ->value(module::get_var("tagsmap", "googlemap_latitude")); - $startingmap_group->input("google_starting_longitude") - ->label(t("Starting Longitude")) - ->value(module::get_var("tagsmap", "googlemap_longitude")); - $startingmap_group->input("google_default_zoom") - ->label(t("Default Zoom Level")) - ->value(module::get_var("tagsmap", "googlemap_zoom")); - $startingmap_group->input("google_default_type") - ->label(t("Default Map Type") . " (G_NORMAL_MAP, G_SATELLITE_MAP, G_HYBRID_MAP, G_PHYSICAL_MAP, G_SATELLITE_3D_MAP)") - ->value(module::get_var("tagsmap", "googlemap_type")); - - // Add a save button to the form. - $form->submit("SaveSettings")->value(t("Save")); - - // Return the newly generated form. - return $form; - } - - public function savemapprefs() { - // Save information associated with Google Maps to the database. - - // Prevent Cross Site Request Forgery - access::verify_csrf(); - - // Figure out the values of the text boxes - $str_googlekey = Input::instance()->post("google_api_key"); - $str_googlelatitude = Input::instance()->post("google_starting_latitude"); - $str_googlelongitude = Input::instance()->post("google_starting_longitude"); - $str_googlezoom = Input::instance()->post("google_default_zoom"); - $str_googlemaptype = Input::instance()->post("google_default_type"); - - // Save Settings. - module::set_var("tagsmap", "googlemap_api_key", $str_googlekey); - module::set_var("tagsmap", "googlemap_latitude", $str_googlelatitude); - module::set_var("tagsmap", "googlemap_longitude", $str_googlelongitude); - module::set_var("tagsmap", "googlemap_zoom", $str_googlezoom); - module::set_var("tagsmap", "googlemap_type", $str_googlemaptype); - - // Display a success message and redirect back to the TagsMap admin page. - message::success(t("Your Settings Have Been Saved.")); - url::redirect("admin/tagsmap"); - } -} \ No newline at end of file diff --git a/themes/3nids_theme/modules/tagsmap/controllers/tagsmap.php b/themes/3nids_theme/modules/tagsmap/controllers/tagsmap.php deleted file mode 100755 index 60e9c1c9..00000000 --- a/themes/3nids_theme/modules/tagsmap/controllers/tagsmap.php +++ /dev/null @@ -1,62 +0,0 @@ -find_all(); - - // Set up and display the actual page. - // If fullsize is true, allow the map to take up the entire browser window, - // if not, then display the map in the gallery theme. - if ($fullsize == true) { - $view = new View("tagsmap_googlemap.html"); - $view->map_fullsize = true; - - // Load in module preferences. - $view->tags_gps = $tagsGPS; - $view->google_map_key = module::get_var("tagsmap", "googlemap_api_key"); - $view->google_map_latitude = module::get_var("tagsmap", "googlemap_latitude"); - $view->google_map_longitude = module::get_var("tagsmap", "googlemap_longitude"); - $view->google_map_zoom = module::get_var("tagsmap", "googlemap_zoom"); - $view->google_map_type = module::get_var("tagsmap", "googlemap_type"); - - print $view; - } else { - $template = new Theme_View("page.html", "other", "Contact"); - //$template->body_attributes("onload=\"GLoad\" onunload=\"Gunload\""); - $template->page_title = t("Gallery :: map"); - $template->content = new View("tagsmap_googlemap.html"); - - // Load in module preferences. - $template->content->tags_gps = $tagsGPS; - $template->content->google_map_key = module::get_var("tagsmap", "googlemap_api_key"); - $template->content->google_map_latitude = module::get_var("tagsmap", "googlemap_latitude"); - $template->content->google_map_longitude = module::get_var("tagsmap", "googlemap_longitude"); - $template->content->google_map_zoom = module::get_var("tagsmap", "googlemap_zoom"); - $template->content->google_map_type = module::get_var("tagsmap", "googlemap_type"); - - print $template; - } - } - - -} diff --git a/themes/3nids_theme/modules/tagsmap/css/tagsmap.css b/themes/3nids_theme/modules/tagsmap/css/tagsmap.css deleted file mode 100755 index eb6dc89a..00000000 --- a/themes/3nids_theme/modules/tagsmap/css/tagsmap.css +++ /dev/null @@ -1,97 +0,0 @@ -.tooltip{ - position: absolute; - left: 10px; - top: 10px; - width: 150px; - background-color: #777; - color: #ffffcc; - border: 1px solid #f9db01; - font: bold 13px "Trebuchet MS", Verdana, Arial, sans-serif; - padding: 4px; - z-index: 20; - -moz-border-radius: 10px; - -moz-opacity: .87; - filter:alpha(opacity=87); - opacity:.87; -} - -.g-map-thumb-table{ - width:200px; - height: 80px; - font-size: 0.9em; - font-style: normal; - color: #FFFFCC; -} -.g-map-thumb-img{ - overflow:auto; - position: relative; - height:125px; -} -.g-map-thumb-link{ - height: 15px; -} -.g-map-thumb-td{ - padding: 0; - text-align: center; -} -.gMapThumbnail{ - height: 80px; -} -#gmInfo{ - width: 230px; -} -#gmInfo_contents{ - background: #3d3d3d; -} -#gmInfo_contents div{ - font-style: italic; - vertical-align: middle; - margin: 0 10px; -} -#gmInfo_tl{ - width: 14px; - height: 14px; - background: url('../images/gmInfo_tl.png') top left no-repeat transparent; -} -#gmInfo_t{ - background: url('../images/gmInfo_t.png') top left repeat-x transparent; -} -#gmInfo_tr{ - width: 14px; - height: 14px; - background: url('../images/gmInfo_tr.png') top left no-repeat transparent; -} -#gmInfo_l{ - width: 14px; - background: url('../images/gmInfo_l.png') top left repeat-y transparent; -} -#gmInfo_r{ - width: 14px; - background: url('../images/gmInfo_r.png') top right repeat-y transparent; -} -#gmInfo_bl{ - width: 14px; - height: 14px; - background: url('../images/gmInfo_bl.png') top left no-repeat transparent; -} -#gmInfo_b{ - background: url('../images/gmInfo_b.png') top left repeat-x transparent; -} -#gmInfo_br{ - width: 14px; - height: 14px; - background: url('../images/gmInfo_br.png') top left no-repeat transparent; -} -#gmInfo_close{ - width: 30px; - height: 30px; - background: url('../images/gmInfo_close.png') top left no-repeat transparent; - margin: -10px 0 0 10px; - cursor: pointer; -} -#gmInfo_beak{ - width: 27px; - height: 33px; - background: url('../images/gmInfo_beak.png') top left no-repeat transparent; -} - diff --git a/themes/3nids_theme/modules/tagsmap/helpers/tagsmap.php b/themes/3nids_theme/modules/tagsmap/helpers/tagsmap.php deleted file mode 100755 index 717e7d2e..00000000 --- a/themes/3nids_theme/modules/tagsmap/helpers/tagsmap.php +++ /dev/null @@ -1,39 +0,0 @@ -viewable() - ->join("items_tags", "items.id", "items_tags.item_id") - ->where("items_tags.tag_id", $tag->tag_id) - ->orderby("items.name", "DESC") - ->find_all(); - return $tagitems; - } -} - -?> \ No newline at end of file diff --git a/themes/3nids_theme/modules/tagsmap/helpers/tagsmap_event.php b/themes/3nids_theme/modules/tagsmap/helpers/tagsmap_event.php deleted file mode 100755 index 27b47ca6..00000000 --- a/themes/3nids_theme/modules/tagsmap/helpers/tagsmap_event.php +++ /dev/null @@ -1,43 +0,0 @@ -deactivate)) { - site_status::warning( - t("The TagsMap module requires the Tags module. " . - "Activate the Tags module now", - array("url" => url::site("admin/modules"))), - "tagsmap_needs_tag"); - } else { - site_status::clear("tagsmap_needs_tag"); - } - } - - static function admin_menu($menu, $theme) { - // Add a link to the TagsMap admin page to the Content menu. - $menu->get("content_menu") - ->append(Menu::factory("link") - ->id("tagsmap") - ->label(t("TagsMap Settings")) - ->url(url::site("admin/tagsmap"))); - } -} \ No newline at end of file diff --git a/themes/3nids_theme/modules/tagsmap/helpers/tagsmap_installer.php b/themes/3nids_theme/modules/tagsmap/helpers/tagsmap_installer.php deleted file mode 100755 index a956ef24..00000000 --- a/themes/3nids_theme/modules/tagsmap/helpers/tagsmap_installer.php +++ /dev/null @@ -1,48 +0,0 @@ -query("CREATE TABLE IF NOT EXISTS {tags_gpses} ( - `id` int(9) NOT NULL auto_increment, - `tag_id` int(9) NOT NULL, - `latitude` varchar(128) NOT NULL, - `longitude` varchar(128) NOT NULL, - `description` varchar(2048) default NULL, - PRIMARY KEY (`id`), - KEY(`tag_id`, `id`)) - DEFAULT CHARSET=utf8;"); - - // Set the module's version number. - module::set_version("tagsmap", 1); - } - - static function deactivate() { - site_status::clear("tagsmap_needs_tag"); - } - - static function uninstall() { - // Delete the GPS table before uninstalling. - $db = Database::instance(); - $db->query("DROP TABLE IF EXISTS {tags_gpses};"); - module::delete("tagsmap"); - } -} diff --git a/themes/3nids_theme/modules/tagsmap/helpers/tagsmap_theme.php b/themes/3nids_theme/modules/tagsmap/helpers/tagsmap_theme.php deleted file mode 100755 index dc895b5b..00000000 --- a/themes/3nids_theme/modules/tagsmap/helpers/tagsmap_theme.php +++ /dev/null @@ -1,24 +0,0 @@ -css("tagsmap.css"); - } -} diff --git a/themes/3nids_theme/modules/tagsmap/images/gmInfo_b.png b/themes/3nids_theme/modules/tagsmap/images/gmInfo_b.png deleted file mode 100755 index 92aee80b7e82bd77e820753a34305610c63977b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2800 zcmV*(P)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0000RNklKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z00027NklWYFi+yrTj)jVf^^lHmJvxDqExbEMv^=N z(rYFLfd2V_RgA*~0C4ewRid9{XM{^tQM#*ZJ2Ow#`9Kzw@jjgobYsR(izO+y2U(x2{o0O;0I+T`RKkN^Mx07*qoM6N<$f&+|yh5!Hn diff --git a/themes/3nids_theme/modules/tagsmap/images/gmInfo_bl.png b/themes/3nids_theme/modules/tagsmap/images/gmInfo_bl.png deleted file mode 100755 index 8f7ecf0f224d6294edb7638312e0655d203b29df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2871 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 diff --git a/themes/3nids_theme/modules/tagsmap/images/gmInfo_l.png b/themes/3nids_theme/modules/tagsmap/images/gmInfo_l.png deleted file mode 100755 index 16ffebba672971f61b74f45422a0cf54db3ff751..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2801 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 D9HKJ8 diff --git a/themes/3nids_theme/modules/tagsmap/images/gmInfo_r.png b/themes/3nids_theme/modules/tagsmap/images/gmInfo_r.png deleted file mode 100755 index b0e42b116db63ac4e4af545c6b44fc9a85ebc29d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2800 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 LNkvXXu0mjfuEI#l diff --git a/themes/3nids_theme/modules/tagsmap/images/gmInfo_tr.png b/themes/3nids_theme/modules/tagsmap/images/gmInfo_tr.png deleted file mode 100755 index 44a2e07bb53a7c61f0e71c25df2f38bcbb3c3849..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2877 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 mapSW.y) { - panY = -(offsetBottom - mapSW.y); - } - } - - //test right of screen - var offsetRight = Math.round(markerPosition.x + this.getDimensions_(this.container_).width/2 + this.getDimensions_(windowR).width + this.paddingX_ + infoWindowAnchor.x - iconAnchor.x); - if (offsetRight > mapNE.x) { - panX = -( offsetRight - mapNE.x); - } else { - //test left of screen - var offsetLeft = - (Math.round( (this.getDimensions_(this.container_).width/2 - this.marker_.getIcon().iconSize.width/2) + this.getDimensions_(windowL).width + this.borderSize_ + this.paddingX_) - markerPosition.x - infoWindowAnchor.x + iconAnchor.x); - if( offsetLeft < mapSW.x) { - panX = mapSW.x - offsetLeft; - } - } - - if (panX != 0 || panY != 0 && this.map_.getExtInfoWindow() != null ) { - this.map_.panBy(new GSize(panX,panY)); - } -}; - -/** - * Private function that handles performing an ajax request to the server. The response - * information is assumed to be HTML and is placed inside this extInfoWindow's contents region. - * Last, check to see if the height has changed, and resize the extInfoWindow accordingly. - * @private - * @param {String} url The Url of where to make the ajax request on the server - */ -ExtInfoWindow.prototype.ajaxRequest_ = function(url){ - var thisMap = this.map_; - var thisCallback = this.callback_; - GDownloadUrl(url, function(response, status){ - var infoWindow = document.getElementById(thisMap.getExtInfoWindow().infoWindowId_ + '_contents'); - if (response == null || status == -1 ) { - infoWindow.innerHTML = 'ERROR: The Ajax request failed to get HTML content from "' + url + '"'; - } else { - infoWindow.innerHTML = response; - } - if (thisCallback != null ) { - thisCallback(); - } - thisMap.getExtInfoWindow().resize(); - GEvent.trigger(thisMap, 'extinfowindowupdate'); - }); -}; - -/** - * Private function derived from Prototype.js to get a given element's - * height and width - * @private - * @param {Object} element The DOM element that will have height and - * width will be calculated for it. - * @return {Object} Object with keys: width, height - */ -ExtInfoWindow.prototype.getDimensions_ = function(element) { - var display = this.getStyle_(element, 'display'); - if (display != 'none' && display != null) { // Safari bug - return {width: element.offsetWidth, height: element.offsetHeight}; - } - - // All *Width and *Height properties give 0 on elements with display none, - // so enable the element temporarily - var els = element.style; - var originalVisibility = els.visibility; - var originalPosition = els.position; - var originalDisplay = els.display; - els.visibility = 'hidden'; - els.position = 'absolute'; - els.display = 'block'; - var originalWidth = element.clientWidth; - var originalHeight = element.clientHeight; - els.display = originalDisplay; - els.position = originalPosition; - els.visibility = originalVisibility; - return {width: originalWidth, height: originalHeight}; -}; - -/** - * Private function derived from Prototype.js to get a given element's - * value that is associated with the passed style - * @private - * @param {Object} element The DOM element that will be checked. - * @param {String} style The style name that will be have it's value returned. - * @return {Object} - */ -ExtInfoWindow.prototype.getStyle_ = function(element, style) { - var found = false; - style = this.camelize_(style); - var value = element.style[style]; - if (!value) { - if (document.defaultView && document.defaultView.getComputedStyle) { - var css = document.defaultView.getComputedStyle(element, null); - value = css ? css[style] : null; - } else if (element.currentStyle) { - value = element.currentStyle[style]; - } - } - if((value == 'auto') && (style == 'width' || style == 'height') && (this.getStyle_(element, 'display') != 'none')) { - if( style == 'width' ) { - value = element.offsetWidth; - }else { - value = element.offsetHeight; - } - } - return (value == 'auto') ? null : value; -}; - -/** - * Private function pulled from Prototype.js that will change a hyphened - * style name into camel case. - * @private - * @param {String} element The string that will be parsed and made into camel case - * @return {String} - */ -ExtInfoWindow.prototype.camelize_ = function(element) { - var parts = element.split('-'), len = parts.length; - if (len == 1) return parts[0]; - var camelized = element.charAt(0) == '-' - ? parts[0].charAt(0).toUpperCase() + parts[0].substring(1) - : parts[0]; - - for (var i = 1; i < len; i++) { - camelized += parts[i].charAt(0).toUpperCase() + parts[i].substring(1); - } - return camelized; -}; - -GMap.prototype.ExtInfoWindowInstance_ = null; -GMap.prototype.ClickListener_ = null; -GMap.prototype.InfoWindowListener_ = null; - -/** - * Creates a new instance of ExtInfoWindow for the GMarker. Register the newly created - * instance with the map, ensuring only one window is open at a time. If this is the first - * ExtInfoWindow ever opened, add event listeners to the map to close the ExtInfoWindow on - * zoom and click, to mimic the default GInfoWindow behavior. - * - * @param {GMap} map The GMap2 object where the ExtInfoWindow will open - * @param {String} cssId The id we will use to reference the info window - * @param {String} html The HTML contents - * @param {Object} opt_opts A contianer for optional arguments: - * {String} ajaxUrl The Url to hit on the server to request some contents - * {Number} paddingX The padding size in pixels that the info window will leave on - * the left and right sides of the map when panning is involved. - * {Number} paddingX The padding size in pixels that the info window will leave on - * the top and bottom sides of the map when panning is involved. - * {Number} beakOffset The repositioning offset for when aligning the beak element. - * This is used to make sure the beak lines up correcting if the - * info window styling containers a border. - */ -GMarker.prototype.openExtInfoWindow = function(map, cssId, html, opt_opts) { - if (map == null) { - throw 'Error in GMarker.openExtInfoWindow: map cannot be null'; - return false; - } - if (cssId == null || cssId == '') { - throw 'Error in GMarker.openExtInfoWindow: must specify a cssId'; - return false; - } - - map.closeInfoWindow(); - if (map.getExtInfoWindow() != null) { - map.closeExtInfoWindow(); - } - if (map.getExtInfoWindow() == null) { - map.setExtInfoWindow_( new ExtInfoWindow( - this, - cssId, - html, - opt_opts - ) ); - if (map.ClickListener_ == null) { - //listen for map click, close ExtInfoWindow if open - map.ClickListener_ = GEvent.addListener(map, 'click', - function(event) { - if( !event && map.getExtInfoWindow() != null ){ - map.closeExtInfoWindow(); - } - } - ); - } - if (map.InfoWindowListener_ == null) { - //listen for default info window open, close ExtInfoWindow if open - map.InfoWindowListener_ = GEvent.addListener(map, 'infowindowopen', - function(event) { - if (map.getExtInfoWindow() != null) { - map.closeExtInfoWindow(); - } - } - ); - } - map.addOverlay(map.getExtInfoWindow()); - } -}; - -/** - * Remove the ExtInfoWindow instance - * @param {GMap2} map The map where the GMarker and ExtInfoWindow exist - */ -GMarker.prototype.closeExtInfoWindow = function(map) { - if( map.getExtInfWindow() != null ){ - map.closeExtInfoWindow(); - } -}; - -/** - * Get the ExtInfoWindow instance from the map - */ -GMap2.prototype.getExtInfoWindow = function(){ - return this.ExtInfoWindowInstance_; -}; -/** - * Set the ExtInfoWindow instance for the map - * @private - */ -GMap2.prototype.setExtInfoWindow_ = function( extInfoWindow ){ - this.ExtInfoWindowInstance_ = extInfoWindow; -} -/** - * Remove the ExtInfoWindow from the map - */ -GMap2.prototype.closeExtInfoWindow = function(){ - if( this.getExtInfoWindow() != null ){ - this.ExtInfoWindowInstance_.remove(); - } -}; diff --git a/themes/3nids_theme/modules/tagsmap/models/tags_gps.php b/themes/3nids_theme/modules/tagsmap/models/tags_gps.php deleted file mode 100755 index c9fda760..00000000 --- a/themes/3nids_theme/modules/tagsmap/models/tags_gps.php +++ /dev/null @@ -1,21 +0,0 @@ - -

- -

-
-

- -

-
You may sign up for a Google Maps API key here.

- -
- -
-

- -

- count()/5 ?> - - -
+"> +
- - - - - -
- count()) ?> -
- $tag): ?> - name, 0, 1)) ?> - - - -
    - - $tags_per_column): /* new column */ ?> -
- - - - - -
    - - -
  • - where("tag_id", $tag->id) - ->find_all(); - ?> - - - - name) ?> - (count ?>) - - id") ?>"> - - 0) { ?> - | id") ?>"> - - - - -
    • - - - - -
-
- - -
-

- -

- - -
- "> - - -
-
diff --git a/themes/3nids_theme/modules/tagsmap/views/admin_tagsmap_delete.html.php b/themes/3nids_theme/modules/tagsmap/views/admin_tagsmap_delete.html.php deleted file mode 100755 index b85641e5..00000000 --- a/themes/3nids_theme/modules/tagsmap/views/admin_tagsmap_delete.html.php +++ /dev/null @@ -1,9 +0,0 @@ - -
-

-

-">Delete -">Cancel - -
- diff --git a/themes/3nids_theme/modules/tagsmap/views/admin_tagsmap_edit.html.php b/themes/3nids_theme/modules/tagsmap/views/admin_tagsmap_edit.html.php deleted file mode 100755 index 66795291..00000000 --- a/themes/3nids_theme/modules/tagsmap/views/admin_tagsmap_edit.html.php +++ /dev/null @@ -1,56 +0,0 @@ - -
-

- -
- - -
- diff --git a/themes/3nids_theme/modules/tagsmap/views/tagsmap_googlemap.html.php b/themes/3nids_theme/modules/tagsmap/views/tagsmap_googlemap.html.php deleted file mode 100755 index d8673482..00000000 --- a/themes/3nids_theme/modules/tagsmap/views/tagsmap_googlemap.html.php +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - <?= t("Gallery :: Map") ?> - - - - - - - - - - -
- - -

- - diff --git a/themes/3nids_theme/modules/theme_3nids/module.info b/themes/3nids_theme/modules/theme_3nids/module.info deleted file mode 100755 index 6f7bfff0..00000000 --- a/themes/3nids_theme/modules/theme_3nids/module.info +++ /dev/null @@ -1,3 +0,0 @@ -name = "3nids theme" -description = "Module needed to display correctly 3nids theme (especialy videos and comments)" -version = 1 From 9d36e222cbf90036304aacf9a892f6c784e6095f Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 27 Nov 2009 14:58:01 -0800 Subject: [PATCH 09/33] Clean up indentation and variable naming to closer match G3 standards. --- themes/3nids/helpers/theme_3nids.php | 131 ++++++++++++--------------- 1 file changed, 60 insertions(+), 71 deletions(-) diff --git a/themes/3nids/helpers/theme_3nids.php b/themes/3nids/helpers/theme_3nids.php index d5bb5dab..923234af 100755 --- a/themes/3nids/helpers/theme_3nids.php +++ b/themes/3nids/helpers/theme_3nids.php @@ -18,84 +18,73 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -/** - * This is the API for handling comments. - * - * Note: by design, this class does not do any permission checking. - */ class theme_3nids_Core { - public function fancylink($item, $viewtype="album", $groupImg = true, $displayComment = true, $parentTitleClass = "h2") { - //viewtype = album || dynamic || header - $link = ""; - access::required("view", $item); - - $photo_size = module::get_var("theme_3nids","photo_size"); - if ($photo_size == "full"){ - $width = $item->width; - $height = $item->height; - }else{ - $width = $item->resize_width; - $height = $item->resize_height; - } - - $desriptionMode = module::get_var("theme_3nids", "description"); - $description = ""; - $tags = tag::item_tags($item); - if(count($tags) && $desriptionMode == "tags"){ - $description = " || " . implode(", ", $tags); - }elseif($desriptionMode == "item" && $item->description != ""){ - $description = " || " . str_replace("\"",""",$item->description); - }elseif (($desriptionMode == "parent" || $desriptionMode == "item") && $item->parent()->description != ""){ - $description = " || " . str_replace("\"",""",$item->parent()->description); - } - - $titleMode = module::get_var("theme_3nids", "title"); - if ($titleMode == "parent"){ - $title = html::clean($item->parent()->title); - }else{ - $title = html::clean($item->title); - } - - $rel = ""; - if ($groupImg == true) {$rel = " rel=\"fancygroup\" ";} - - if ($item->is_photo() || ($item->is_movie()) && module::is_active("theme_3nids")){ - $fancymodule = ""; - if (module::is_active("exif")){ - $fancymodule .= "exif::" . url::site("exif/show/{$item->id}") . ";;";} - if (module::is_active("comment") && module::is_active("theme_3nids")){ - $fancymodule .= "comment::" . url::site("comments_3nids?item_id={$item->id}") . ";;comment_count::" . comment_3nids::count($item) . ";;" ;} - if ($item->is_photo()){ - $link .= "id}") ."/?w=" . $width . "xewx&h=" . $height . "xehx\" " . $rel . " class=\"fancyclass iframe\" title=\"" . $title . $description ."\" name=\"" . $fancymodule . " \">"; - }else{ - $link .= "id}") . "/?w=" . strval(20+($width)) . "xewx&h=" . strval(50+($height)) . "xehx\" " . $rel . " class=\"fancyclass iframe\" title=\"" . $item->parent()->title . $description ."\" name=\"" . $fancymodule . " \">"; - } - } elseif( $item->is_album() && $viewtype != "header"){ - $link .= "url() . "\">"; - } + public function fancylink($item, $view_type="album", $group_img = true, $display_comment = true, $parent_title_class = "h2") { + // view_type = album || dynamic || header + $link = ""; + access::required("view", $item); - if($viewtype != "header"){ - $link .= $item->thumb_img(array("class" => "g-thumbnail")) . ""; - if( $item->is_album() && $viewtype == "album" ){ - $link .= "url() . "?show=" . $item->id . "\"><$parentTitleClass>" . html::clean($item->title) . ""; - } elseif ( !($item->is_album()) && $viewtype == "dynamic") { - $link .= "parent()->url() . "?show=" . $item->id . "\" class=\"g-parent-album\"><$parentTitleClass>" . html::clean($item->parent()->title) . ""; - } - - if (($item->is_photo() || $item->is_movie()) && $displayComment==true && module::is_active("comment") && module::is_active("theme_3nids")) { - $link .= ""; - } - }else{ - $link .= ""; - } - return $link; - } + $photo_size = module::get_var("theme_3nids", "photo_size"); + if ($photo_size == "full"){ + $width = $item->width; + $height = $item->height; + }else{ + $width = $item->resize_width; + $height = $item->resize_height; + } + $desriptionMode = module::get_var("theme_3nids", "description"); + $description = ""; + $tags = tag::item_tags($item); + if(count($tags) && $desriptionMode == "tags"){ + $description = " || " . implode(", ", $tags); + }elseif($desriptionMode == "item" && $item->description != ""){ + $description = " || " . str_replace("\"",""",$item->description); + }elseif (($desriptionMode == "parent" || $desriptionMode == "item") && $item->parent()->description != ""){ + $description = " || " . str_replace("\"",""",$item->parent()->description); + } + $titleMode = module::get_var("theme_3nids", "title"); + if ($titleMode == "parent"){ + $title = html::clean($item->parent()->title); + }else{ + $title = html::clean($item->title); + } + $rel = ""; + if ($group_img == true) {$rel = " rel=\"fancygroup\" ";} + if ($item->is_photo() || ($item->is_movie()) && module::is_active("theme_3nids")){ + $fancymodule = ""; + if (module::is_active("exif")){ + $fancymodule .= "exif::" . url::site("exif/show/{$item->id}") . ";;";} + if (module::is_active("comment") && module::is_active("theme_3nids")){ + $fancymodule .= "comment::" . url::site("comments_3nids?item_id={$item->id}") . ";;comment_count::" . comment_3nids::count($item) . ";;" ;} + if ($item->is_photo()){ + $link .= "id}") ."/?w=" . $width . "xewx&h=" . $height . "xehx\" " . $rel . " class=\"fancyclass iframe\" title=\"" . $title . $description ."\" name=\"" . $fancymodule . " \">"; + }else{ + $link .= "id}") . "/?w=" . strval(20+($width)) . "xewx&h=" . strval(50+($height)) . "xehx\" " . $rel . " class=\"fancyclass iframe\" title=\"" . $item->parent()->title . $description ."\" name=\"" . $fancymodule . " \">"; + } + } elseif( $item->is_album() && $view_type != "header"){ + $link .= "url() . "\">"; + } + if($view_type != "header"){ + $link .= $item->thumb_img(array("class" => "g-thumbnail")) . ""; + if( $item->is_album() && $view_type == "album" ){ + $link .= "url() . "?show=" . $item->id . "\"><$parent_title_class>" . html::clean($item->title) . ""; + } elseif ( !($item->is_album()) && $view_type == "dynamic") { + $link .= "parent()->url() . "?show=" . $item->id . "\" class=\"g-parent-album\"><$parent_title_class>" . html::clean($item->parent()->title) . ""; + } + + if (($item->is_photo() || $item->is_movie()) && $display_comment==true && module::is_active("comment") && module::is_active("theme_3nids")) { + $link .= ""; + } + }else{ + $link .= ""; + } + return $link; + } } - ?> \ No newline at end of file From 77dd601c2df7e65f492c23317408c223ec34b67c Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 27 Nov 2009 15:04:19 -0800 Subject: [PATCH 10/33] Normalize indentation. --- themes/3nids/views/album.html.php | 75 ++++++++++++++++--------------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/themes/3nids/views/album.html.php b/themes/3nids/views/album.html.php index 63f2c45d..4b24ab0e 100755 --- a/themes/3nids/views/album.html.php +++ b/themes/3nids/views/album.html.php @@ -5,44 +5,47 @@

title) ?>

description)) ?>
-viewable()->children(); - $theme->pagination = new Pagination(); - $theme->pagination->initialize(array("query_string" => "page","total_items" => $children_count,"items_per_page" => $page_size,"style" => "classic")); - $children_offset = ($theme->pagination->current_page -1) * $page_size ; ?> - - +viewable()->children(); +$theme->pagination = new Pagination(); +$theme->pagination->initialize( + array("query_string" => "page","total_items" => $children_count,"items_per_page" => $page_size,"style" => "classic")); +$children_offset = ($theme->pagination->current_page -1) * $page_size ; +?>
    - - - - - - $child): ?> - - is_album()): ?> - - -
  • - thumb_top($child) ?> - - thumb_bottom($child) ?> - context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?> -
    • - - - - - - - admin || access::can("add", $item)): ?> - id") ?> -
  • Add some.", - array("attrs" => html::mark_clean("href=\"$addurl\" class=\"g-dialog-link\""))) ?>
    • + + + + + + + $child): ?> + + is_album()): ?> + + +
  • + thumb_top($child) ?> + + thumb_bottom($child) ?> + context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?> +
    • + + + + + + -
    • - - + admin || access::can("add", $item)): ?> + id") ?> +
  • Add some.", + array("attrs" => html::mark_clean("href=\"$addurl\" class=\"g-dialog-link\""))) ?>
    • + +
    • + +
album_bottom() ?> -pager() ?> +paginator() ?> From f9cdd21db0dcf5cae33ee4870d74a7d52e89d960 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 27 Nov 2009 15:11:10 -0800 Subject: [PATCH 11/33] Normalize code style. --- themes/3nids/helpers/3nids.php | 109 +++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100755 themes/3nids/helpers/3nids.php diff --git a/themes/3nids/helpers/3nids.php b/themes/3nids/helpers/3nids.php new file mode 100755 index 00000000..f3751343 --- /dev/null +++ b/themes/3nids/helpers/3nids.php @@ -0,0 +1,109 @@ +width; + $height = $item->height; + }else{ + $width = $item->resize_width; + $height = $item->resize_height; + } + + $description_mode = module::get_var("3nids", "description"); + $description = ""; + $tags = tag::item_tags($item); + if(count($tags) && $description_mode == "tags"){ + $description = " || " . implode(", ", $tags); + } else if ($description_mode == "item" && $item->description != ""){ + $description = " || " . str_replace("\"",""",$item->description); + } else if (($description_mode == "parent" || + $description_mode == "item") && $item->parent()->description != ""){ + $description = " || " . str_replace("\"", """, $item->parent()->description); + } + + $title_mode = module::get_var("3nids", "title"); + if ($title_mode == "parent"){ + $title = html::clean($item->parent()->title); + } else { + $title = html::clean($item->title); + } + + $rel = ""; + if ($group_img == true) { + $rel = " rel=\"fancygroup\" "; + } + + if ($item->is_photo() || ($item->is_movie()) && module::is_active("theme_3nids")){ + $fancymodule = ""; + if (module::is_active("exif")) { + $fancymodule .= "exif::" . url::site("exif/show/{$item->id}") . ";;"; + } + if (module::is_active("comment") && module::is_active("theme_3nids")) { + $fancymodule .= "comment::" . url::site("comments_3nids?item_id={$item->id}") . + ";;comment_count::" . comment_3nids::count($item) . ";;"; + } + if ($item->is_photo()){ + $link .= "id}") ."/?w=" . $width . + "xewx&h=" . $height . "xehx\" " . $rel . " class=\"fancyclass iframe\" title=\"" . + $title . $description ."\" name=\"" . $fancymodule . " \">"; + } else { + $link .= "id}") . "/?w=" . + strval(20 + $width) . "xewx&h=" . strval(50 + $height) . "xehx\" " . $rel . + " class=\"fancyclass iframe\" title=\"" . $item->parent()->title . $description . + "\" name=\"" . $fancymodule . " \">"; + } + } else if ($item->is_album() && $view_type != "header") { + $link .= "url() . "\">"; + } + + if ($view_type != "header") { + $link .= $item->thumb_img(array("class" => "g-thumbnail")) . ""; + if ($item->is_album() && $view_type == "album") { + $link .= "url() . "?show=" . $item->id . + "\"><$parent_title_class>" . html::clean($item->title) . + ""; + } else if (!($item->is_album()) && $view_type == "dynamic") { + $link .= "parent()->url() . "?show=" . $item->id . + "\" class=\"g-parent-album\"><$parent_title_class>" . + html::clean($item->parent()->title) . ""; + } + + if (($item->is_photo() || $item->is_movie()) && $display_comment && + module::is_active("comment")) { + $link .= ""; + } + } else { + $link .= ""; + } + return $link; + } +} +?> \ No newline at end of file From 97db9f478e441e9148223ea0470edd590bf72275 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 27 Nov 2009 15:13:17 -0800 Subject: [PATCH 12/33] Updated to reflect the fact that we've gotten rid of REST_Controller Updated for changes in the paginator.. --- themes/3nids/controllers/comments_3nids.php | 8 +- themes/3nids/controllers/movie_3nids.php | 21 ++--- themes/3nids/controllers/photo_3nids.php | 27 +++--- ...{theme_3nids_event.php => 3nids_event.php} | 0 themes/3nids/helpers/theme_3nids.php | 90 ------------------- themes/3nids/views/dynamic.html.php | 4 +- themes/3nids/views/pager.html.php | 43 --------- themes/3nids/views/paginator.html.php | 87 ++++++++++++++++++ themes/3nids/views/search.html.php | 2 +- 9 files changed, 109 insertions(+), 173 deletions(-) rename themes/3nids/helpers/{theme_3nids_event.php => 3nids_event.php} (100%) delete mode 100755 themes/3nids/helpers/theme_3nids.php delete mode 100755 themes/3nids/views/pager.html.php create mode 100755 themes/3nids/views/paginator.html.php diff --git a/themes/3nids/controllers/comments_3nids.php b/themes/3nids/controllers/comments_3nids.php index f45e54e2..84dfa3d8 100755 --- a/themes/3nids/controllers/comments_3nids.php +++ b/themes/3nids/controllers/comments_3nids.php @@ -17,14 +17,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -class Comments_3nids_Controller extends REST_Controller { - protected $resource_type = "comment"; +class Comments_3nids_Controller extends Items_Controller { - - /** - * Display comments based on criteria. - * @see REST_Controller::_index() - */ public function _index() { $item_id = $this->input->get('item_id'); $item = ORM::factory("item", $item_id); diff --git a/themes/3nids/controllers/movie_3nids.php b/themes/3nids/controllers/movie_3nids.php index fd938c32..a57def2f 100755 --- a/themes/3nids/controllers/movie_3nids.php +++ b/themes/3nids/controllers/movie_3nids.php @@ -17,22 +17,17 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -class Movie_3nids_Controller extends REST_Controller { - protected $resource_type = "movie_3nids"; +class Movie_3nids_Controller extends Items_Controller { - - /** - * Display comments based on criteria. - * @see REST_Controller::_index() - */ public function show($item_id) { - $item = ORM::factory("item", $item_id); + $item = ORM::factory("item", $item_id); access::required("view", $item); $view = new Theme_View("movie_3nids.html", "other", "page"); - $view->item = $item; - $view->attrs = array("class" => "g-movie", "id" => "g-movie-id-{$item->id}", "style" => "display:block;width:{$item->width}px;height:{$item->height}px"); - print $view; - break; - } + $view->item = $item; + $view->attrs = array( + "class" => "g-movie", "id" => "g-movie-id-{$item->id}", + "style" => "display:block;width:{$item->width}px;height:{$item->height}px"); + print $view; + } } \ No newline at end of file diff --git a/themes/3nids/controllers/photo_3nids.php b/themes/3nids/controllers/photo_3nids.php index 3d3087ce..131c1f82 100755 --- a/themes/3nids/controllers/photo_3nids.php +++ b/themes/3nids/controllers/photo_3nids.php @@ -17,27 +17,20 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -class Photo_3nids_Controller extends REST_Controller { - protected $resource_type = "photo_3nids"; +class Photo_3nids_Controller extends Items_Controller { - - /** - * Display comments based on criteria. - * @see REST_Controller::_index() - */ public function show($item_id) { $item = ORM::factory("item", $item_id); access::required("view", $item); - $view = new Theme_View("photo_3nids.html", "other", "page"); - $view->item = $item; - $photo_size = module::get_var("theme_3nids","photo_size"); - if ($photo_size == "full"){ - $view->item_url = $item->file_url(); - }else{ - $view->item_url = $item->resize_url(); - } - print $view; - break; + $view = new Theme_View("photo_3nids.html", "other", "page"); + $view->item = $item; + $photo_size = module::get_var("theme_3nids","photo_size"); + if ($photo_size == "full"){ + $view->item_url = $item->file_url(); + } else { + $view->item_url = $item->resize_url(); } + print $view; + } } \ No newline at end of file diff --git a/themes/3nids/helpers/theme_3nids_event.php b/themes/3nids/helpers/3nids_event.php similarity index 100% rename from themes/3nids/helpers/theme_3nids_event.php rename to themes/3nids/helpers/3nids_event.php diff --git a/themes/3nids/helpers/theme_3nids.php b/themes/3nids/helpers/theme_3nids.php deleted file mode 100755 index 923234af..00000000 --- a/themes/3nids/helpers/theme_3nids.php +++ /dev/null @@ -1,90 +0,0 @@ -width; - $height = $item->height; - }else{ - $width = $item->resize_width; - $height = $item->resize_height; - } - - $desriptionMode = module::get_var("theme_3nids", "description"); - $description = ""; - $tags = tag::item_tags($item); - if(count($tags) && $desriptionMode == "tags"){ - $description = " || " . implode(", ", $tags); - }elseif($desriptionMode == "item" && $item->description != ""){ - $description = " || " . str_replace("\"",""",$item->description); - }elseif (($desriptionMode == "parent" || $desriptionMode == "item") && $item->parent()->description != ""){ - $description = " || " . str_replace("\"",""",$item->parent()->description); - } - - $titleMode = module::get_var("theme_3nids", "title"); - if ($titleMode == "parent"){ - $title = html::clean($item->parent()->title); - }else{ - $title = html::clean($item->title); - } - - $rel = ""; - if ($group_img == true) {$rel = " rel=\"fancygroup\" ";} - - if ($item->is_photo() || ($item->is_movie()) && module::is_active("theme_3nids")){ - $fancymodule = ""; - if (module::is_active("exif")){ - $fancymodule .= "exif::" . url::site("exif/show/{$item->id}") . ";;";} - if (module::is_active("comment") && module::is_active("theme_3nids")){ - $fancymodule .= "comment::" . url::site("comments_3nids?item_id={$item->id}") . ";;comment_count::" . comment_3nids::count($item) . ";;" ;} - if ($item->is_photo()){ - $link .= "id}") ."/?w=" . $width . "xewx&h=" . $height . "xehx\" " . $rel . " class=\"fancyclass iframe\" title=\"" . $title . $description ."\" name=\"" . $fancymodule . " \">"; - }else{ - $link .= "id}") . "/?w=" . strval(20+($width)) . "xewx&h=" . strval(50+($height)) . "xehx\" " . $rel . " class=\"fancyclass iframe\" title=\"" . $item->parent()->title . $description ."\" name=\"" . $fancymodule . " \">"; - } - } elseif( $item->is_album() && $view_type != "header"){ - $link .= "url() . "\">"; - } - - if($view_type != "header"){ - $link .= $item->thumb_img(array("class" => "g-thumbnail")) . ""; - if( $item->is_album() && $view_type == "album" ){ - $link .= "url() . "?show=" . $item->id . "\"><$parent_title_class>" . html::clean($item->title) . ""; - } elseif ( !($item->is_album()) && $view_type == "dynamic") { - $link .= "parent()->url() . "?show=" . $item->id . "\" class=\"g-parent-album\"><$parent_title_class>" . html::clean($item->parent()->title) . ""; - } - - if (($item->is_photo() || $item->is_movie()) && $display_comment==true && module::is_active("comment") && module::is_active("theme_3nids")) { - $link .= ""; - } - }else{ - $link .= ""; - } - return $link; - } -} -?> \ No newline at end of file diff --git a/themes/3nids/views/dynamic.html.php b/themes/3nids/views/dynamic.html.php index 5407c53f..e32aad08 100755 --- a/themes/3nids/views/dynamic.html.php +++ b/themes/3nids/views/dynamic.html.php @@ -18,7 +18,7 @@ $child): ?> - +
  • thumb_top($child) ?> @@ -34,4 +34,4 @@ dynamic_bottom() ?> -pager() ?> +paginator() ?> diff --git a/themes/3nids/views/pager.html.php b/themes/3nids/views/pager.html.php deleted file mode 100755 index 1c259579..00000000 --- a/themes/3nids/views/pager.html.php +++ /dev/null @@ -1,43 +0,0 @@ - - -
      - $total_pages, - "current_page" => $current_page)) ?> -
    • - - - - - - - - - - - - - - -
      • -
      • -
    • - - - - - - - - - - - - - - -
      • -
    diff --git a/themes/3nids/views/paginator.html.php b/themes/3nids/views/paginator.html.php new file mode 100755 index 00000000..5034c965 --- /dev/null +++ b/themes/3nids/views/paginator.html.php @@ -0,0 +1,87 @@ + + + +
      +
    • + + + + + + + + + + + + + + + + + +
      • + +
    • + + + $first_visible_position, + "to_number" => $last_visible_position, + "count" => $total)) ?> + + $position, "total" => $total)) ?> + + + + +
      • + +
    • + + + + + + + + + + + + + + + + + +
      • +
    diff --git a/themes/3nids/views/search.html.php b/themes/3nids/views/search.html.php index 428a8213..909dbc03 100755 --- a/themes/3nids/views/search.html.php +++ b/themes/3nids/views/search.html.php @@ -28,7 +28,7 @@ - pager() ?> + paginator() ?>

    From e8302ffcc8cbd10d7ab3f465d36e95a5092ce095 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 27 Nov 2009 15:14:21 -0800 Subject: [PATCH 13/33] Rename "theme_3nids" to just "3nids" since we no longer have a theme_3nids module. --- .../3nids/controllers/admin_theme_3nids.php | 20 +++++++++---------- themes/3nids/controllers/photo_3nids.php | 2 +- themes/3nids/helpers/3nids.php | 4 ++-- themes/3nids/helpers/3nids_event.php | 6 +++--- themes/3nids/helpers/theme_3nids_theme.php | 2 +- ...me_3nids.html.php => admin_3nids.html.php} | 0 themes/3nids/views/album.html.php | 6 +++--- themes/3nids/views/dynamic.html.php | 6 +++--- themes/3nids/views/image_block_block.html.php | 2 +- themes/3nids/views/search.html.php | 6 +++--- 10 files changed, 27 insertions(+), 27 deletions(-) rename themes/3nids/views/{admin_theme_3nids.html.php => admin_3nids.html.php} (100%) diff --git a/themes/3nids/controllers/admin_theme_3nids.php b/themes/3nids/controllers/admin_theme_3nids.php index 133bb143..16427dd9 100755 --- a/themes/3nids/controllers/admin_theme_3nids.php +++ b/themes/3nids/controllers/admin_theme_3nids.php @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -class Admin_theme_3nids_Controller extends Admin_Controller { +class Admin_3nids_Controller extends Admin_Controller { public function index() { // Generate a new admin page. $view = new Admin_View("admin.html"); - $view->content = new View("admin_theme_3nids.html"); + $view->content = new View("admin_3nids.html"); // Generate a form for Google Maps Settings. $view->content->theme_form = $this->_get_3nids_form(); @@ -35,19 +35,19 @@ class Admin_theme_3nids_Controller extends Admin_Controller { private function _get_3nids_form() { // Make a new form for inputing information associated with google maps. - $form = new Forge("admin/theme_3nids/save3nidsprefs", "", "post", + $form = new Forge("admin/3nids/save3nidsprefs", "", "post", array("id" => "gTagsMapAdminForm")); // Input box for the Maps API Key $form->input("title") ->label(t("item title : parent or item.")) - ->value(module::get_var("theme_3nids", "title")); + ->value(module::get_var("3nids", "title")); $form->input("description") ->label(t("item description : tags or item or parent or nothing. If item description chosen and not available, then parent description is used.")) - ->value(module::get_var("theme_3nids", "description")); + ->value(module::get_var("3nids", "description")); $form->input("photo_size") ->label(t("Photo size: resize or full.")) - ->value(module::get_var("theme_3nids", "photo_size")); + ->value(module::get_var("3nids", "photo_size")); // Add a save button to the form. $form->submit("SaveSettings")->value(t("Save")); @@ -68,12 +68,12 @@ class Admin_theme_3nids_Controller extends Admin_Controller { $photo_size = Input::instance()->post("photo_size"); // Save Settings. - module::set_var("theme_3nids", "description", $description); - module::set_var("theme_3nids", "title", $title); - module::set_var("theme_3nids", "photo_size", $photo_size); + module::set_var("3nids", "description", $description); + module::set_var("3nids", "title", $title); + module::set_var("3nids", "photo_size", $photo_size); // Display a success message and redirect back to the TagsMap admin page. message::success(t("Your Settings Have Been Saved.")); - url::redirect("admin/theme_3nids"); + url::redirect("admin/3nids"); } } \ No newline at end of file diff --git a/themes/3nids/controllers/photo_3nids.php b/themes/3nids/controllers/photo_3nids.php index 131c1f82..a294197e 100755 --- a/themes/3nids/controllers/photo_3nids.php +++ b/themes/3nids/controllers/photo_3nids.php @@ -25,7 +25,7 @@ class Photo_3nids_Controller extends Items_Controller { $view = new Theme_View("photo_3nids.html", "other", "page"); $view->item = $item; - $photo_size = module::get_var("theme_3nids","photo_size"); + $photo_size = module::get_var("3nids","photo_size"); if ($photo_size == "full"){ $view->item_url = $item->file_url(); } else { diff --git a/themes/3nids/helpers/3nids.php b/themes/3nids/helpers/3nids.php index f3751343..9c7d851c 100755 --- a/themes/3nids/helpers/3nids.php +++ b/themes/3nids/helpers/3nids.php @@ -58,12 +58,12 @@ class 3nids_Core { $rel = " rel=\"fancygroup\" "; } - if ($item->is_photo() || ($item->is_movie()) && module::is_active("theme_3nids")){ + if ($item->is_photo() || ($item->is_movie()) && module::is_active("3nids")){ $fancymodule = ""; if (module::is_active("exif")) { $fancymodule .= "exif::" . url::site("exif/show/{$item->id}") . ";;"; } - if (module::is_active("comment") && module::is_active("theme_3nids")) { + if (module::is_active("comment") && module::is_active("3nids")) { $fancymodule .= "comment::" . url::site("comments_3nids?item_id={$item->id}") . ";;comment_count::" . comment_3nids::count($item) . ";;"; } diff --git a/themes/3nids/helpers/3nids_event.php b/themes/3nids/helpers/3nids_event.php index 0e36dab0..e166eebc 100755 --- a/themes/3nids/helpers/3nids_event.php +++ b/themes/3nids/helpers/3nids_event.php @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -class theme_3nids_event_Core { +class 3nids_event_Core { static function admin_menu($menu, $theme) { // Add a link to the TagsMap admin page to the Content menu. $menu->get("content_menu") ->append(Menu::factory("link") - ->id("theme_3nids") + ->id("3nids") ->label(t("Theme 3nids Settings")) - ->url(url::site("admin/theme_3nids"))); + ->url(url::site("admin/3nids"))); } } \ No newline at end of file diff --git a/themes/3nids/helpers/theme_3nids_theme.php b/themes/3nids/helpers/theme_3nids_theme.php index bc035674..08827ddf 100755 --- a/themes/3nids/helpers/theme_3nids_theme.php +++ b/themes/3nids/helpers/theme_3nids_theme.php @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -class theme_3nids_theme { +class 3nids_theme { static function credits($theme) { return "3nids theme"; diff --git a/themes/3nids/views/admin_theme_3nids.html.php b/themes/3nids/views/admin_3nids.html.php similarity index 100% rename from themes/3nids/views/admin_theme_3nids.html.php rename to themes/3nids/views/admin_3nids.html.php diff --git a/themes/3nids/views/album.html.php b/themes/3nids/views/album.html.php index 4b24ab0e..3f68449c 100755 --- a/themes/3nids/views/album.html.php +++ b/themes/3nids/views/album.html.php @@ -16,7 +16,7 @@ $children_offset = ($theme->pagination->current_page -1) * $page_size ; - + $child): ?> @@ -26,7 +26,7 @@ $children_offset = ($theme->pagination->current_page -1) * $page_size ;

  • thumb_top($child) ?> - + thumb_bottom($child) ?> context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?>
    • @@ -34,7 +34,7 @@ $children_offset = ($theme->pagination->current_page -1) * $page_size ; - + admin || access::can("add", $item)): ?> diff --git a/themes/3nids/views/dynamic.html.php b/themes/3nids/views/dynamic.html.php index e32aad08..775a4041 100755 --- a/themes/3nids/views/dynamic.html.php +++ b/themes/3nids/views/dynamic.html.php @@ -14,7 +14,7 @@
      - + $child): ?> @@ -22,7 +22,7 @@
    • thumb_top($child) ?> - + thumb_bottom($child) ?> context_menu($child, "#g-ItemId-{$child->id} .g-Thumbnail") ?>
      • @@ -30,7 +30,7 @@
    - + dynamic_bottom() ?> diff --git a/themes/3nids/views/image_block_block.html.php b/themes/3nids/views/image_block_block.html.php index 103be25d..44a9667c 100755 --- a/themes/3nids/views/image_block_block.html.php +++ b/themes/3nids/views/image_block_block.html.php @@ -1,3 +1,3 @@ - + diff --git a/themes/3nids/views/search.html.php b/themes/3nids/views/search.html.php index 909dbc03..53023377 100755 --- a/themes/3nids/views/search.html.php +++ b/themes/3nids/views/search.html.php @@ -13,19 +13,19 @@
      - +
    • thumb_top($child) ?> - + thumb_bottom($child) ?> context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?>
      • - +
    paginator() ?> From fe468a6014fd10973495aa6bdb48cd6f14974189 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 27 Nov 2009 15:15:03 -0800 Subject: [PATCH 14/33] Add spaces after commas. --- themes/3nids/views/album.html.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/themes/3nids/views/album.html.php b/themes/3nids/views/album.html.php index 3f68449c..d61657e3 100755 --- a/themes/3nids/views/album.html.php +++ b/themes/3nids/views/album.html.php @@ -9,14 +9,14 @@ $children_all = $item->viewable()->children(); $theme->pagination = new Pagination(); $theme->pagination->initialize( - array("query_string" => "page","total_items" => $children_count,"items_per_page" => $page_size,"style" => "classic")); + array("query_string" => "page", "total_items" => $children_count, "items_per_page" => $page_size, "style" => "classic")); $children_offset = ($theme->pagination->current_page -1) * $page_size ; ?>
      - + $child): ?> @@ -26,7 +26,7 @@ $children_offset = ($theme->pagination->current_page -1) * $page_size ;
    • thumb_top($child) ?> - + thumb_bottom($child) ?> context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?>
      • @@ -34,7 +34,7 @@ $children_offset = ($theme->pagination->current_page -1) * $page_size ; - + admin || access::can("add", $item)): ?> From 14479205922201f9546328b1c04425c9b3be9309 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 27 Nov 2009 15:20:17 -0800 Subject: [PATCH 15/33] Revert "Rename "theme_3nids" to just "3nids" since we no longer have a theme_3nids module." This reverts commit e8302ffcc8cbd10d7ab3f465d36e95a5092ce095. Conflicts: themes/3nids/views/album.html.php --- .../3nids/controllers/admin_theme_3nids.php | 20 +++++++++---------- themes/3nids/controllers/photo_3nids.php | 2 +- themes/3nids/helpers/3nids.php | 4 ++-- themes/3nids/helpers/3nids_event.php | 6 +++--- themes/3nids/helpers/theme_3nids_theme.php | 2 +- ...ds.html.php => admin_theme_3nids.html.php} | 0 themes/3nids/views/album.html.php | 6 +++--- themes/3nids/views/dynamic.html.php | 6 +++--- themes/3nids/views/image_block_block.html.php | 2 +- themes/3nids/views/search.html.php | 6 +++--- 10 files changed, 27 insertions(+), 27 deletions(-) rename themes/3nids/views/{admin_3nids.html.php => admin_theme_3nids.html.php} (100%) diff --git a/themes/3nids/controllers/admin_theme_3nids.php b/themes/3nids/controllers/admin_theme_3nids.php index 16427dd9..133bb143 100755 --- a/themes/3nids/controllers/admin_theme_3nids.php +++ b/themes/3nids/controllers/admin_theme_3nids.php @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -class Admin_3nids_Controller extends Admin_Controller { +class Admin_theme_3nids_Controller extends Admin_Controller { public function index() { // Generate a new admin page. $view = new Admin_View("admin.html"); - $view->content = new View("admin_3nids.html"); + $view->content = new View("admin_theme_3nids.html"); // Generate a form for Google Maps Settings. $view->content->theme_form = $this->_get_3nids_form(); @@ -35,19 +35,19 @@ class Admin_3nids_Controller extends Admin_Controller { private function _get_3nids_form() { // Make a new form for inputing information associated with google maps. - $form = new Forge("admin/3nids/save3nidsprefs", "", "post", + $form = new Forge("admin/theme_3nids/save3nidsprefs", "", "post", array("id" => "gTagsMapAdminForm")); // Input box for the Maps API Key $form->input("title") ->label(t("item title : parent or item.")) - ->value(module::get_var("3nids", "title")); + ->value(module::get_var("theme_3nids", "title")); $form->input("description") ->label(t("item description : tags or item or parent or nothing. If item description chosen and not available, then parent description is used.")) - ->value(module::get_var("3nids", "description")); + ->value(module::get_var("theme_3nids", "description")); $form->input("photo_size") ->label(t("Photo size: resize or full.")) - ->value(module::get_var("3nids", "photo_size")); + ->value(module::get_var("theme_3nids", "photo_size")); // Add a save button to the form. $form->submit("SaveSettings")->value(t("Save")); @@ -68,12 +68,12 @@ class Admin_3nids_Controller extends Admin_Controller { $photo_size = Input::instance()->post("photo_size"); // Save Settings. - module::set_var("3nids", "description", $description); - module::set_var("3nids", "title", $title); - module::set_var("3nids", "photo_size", $photo_size); + module::set_var("theme_3nids", "description", $description); + module::set_var("theme_3nids", "title", $title); + module::set_var("theme_3nids", "photo_size", $photo_size); // Display a success message and redirect back to the TagsMap admin page. message::success(t("Your Settings Have Been Saved.")); - url::redirect("admin/3nids"); + url::redirect("admin/theme_3nids"); } } \ No newline at end of file diff --git a/themes/3nids/controllers/photo_3nids.php b/themes/3nids/controllers/photo_3nids.php index a294197e..131c1f82 100755 --- a/themes/3nids/controllers/photo_3nids.php +++ b/themes/3nids/controllers/photo_3nids.php @@ -25,7 +25,7 @@ class Photo_3nids_Controller extends Items_Controller { $view = new Theme_View("photo_3nids.html", "other", "page"); $view->item = $item; - $photo_size = module::get_var("3nids","photo_size"); + $photo_size = module::get_var("theme_3nids","photo_size"); if ($photo_size == "full"){ $view->item_url = $item->file_url(); } else { diff --git a/themes/3nids/helpers/3nids.php b/themes/3nids/helpers/3nids.php index 9c7d851c..f3751343 100755 --- a/themes/3nids/helpers/3nids.php +++ b/themes/3nids/helpers/3nids.php @@ -58,12 +58,12 @@ class 3nids_Core { $rel = " rel=\"fancygroup\" "; } - if ($item->is_photo() || ($item->is_movie()) && module::is_active("3nids")){ + if ($item->is_photo() || ($item->is_movie()) && module::is_active("theme_3nids")){ $fancymodule = ""; if (module::is_active("exif")) { $fancymodule .= "exif::" . url::site("exif/show/{$item->id}") . ";;"; } - if (module::is_active("comment") && module::is_active("3nids")) { + if (module::is_active("comment") && module::is_active("theme_3nids")) { $fancymodule .= "comment::" . url::site("comments_3nids?item_id={$item->id}") . ";;comment_count::" . comment_3nids::count($item) . ";;"; } diff --git a/themes/3nids/helpers/3nids_event.php b/themes/3nids/helpers/3nids_event.php index e166eebc..0e36dab0 100755 --- a/themes/3nids/helpers/3nids_event.php +++ b/themes/3nids/helpers/3nids_event.php @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -class 3nids_event_Core { +class theme_3nids_event_Core { static function admin_menu($menu, $theme) { // Add a link to the TagsMap admin page to the Content menu. $menu->get("content_menu") ->append(Menu::factory("link") - ->id("3nids") + ->id("theme_3nids") ->label(t("Theme 3nids Settings")) - ->url(url::site("admin/3nids"))); + ->url(url::site("admin/theme_3nids"))); } } \ No newline at end of file diff --git a/themes/3nids/helpers/theme_3nids_theme.php b/themes/3nids/helpers/theme_3nids_theme.php index 08827ddf..bc035674 100755 --- a/themes/3nids/helpers/theme_3nids_theme.php +++ b/themes/3nids/helpers/theme_3nids_theme.php @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -class 3nids_theme { +class theme_3nids_theme { static function credits($theme) { return "3nids theme"; diff --git a/themes/3nids/views/admin_3nids.html.php b/themes/3nids/views/admin_theme_3nids.html.php similarity index 100% rename from themes/3nids/views/admin_3nids.html.php rename to themes/3nids/views/admin_theme_3nids.html.php diff --git a/themes/3nids/views/album.html.php b/themes/3nids/views/album.html.php index d61657e3..726ca804 100755 --- a/themes/3nids/views/album.html.php +++ b/themes/3nids/views/album.html.php @@ -16,7 +16,7 @@ $children_offset = ($theme->pagination->current_page -1) * $page_size ; - + $child): ?> @@ -26,7 +26,7 @@ $children_offset = ($theme->pagination->current_page -1) * $page_size ;
    • thumb_top($child) ?> - + thumb_bottom($child) ?> context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?>
      • @@ -34,7 +34,7 @@ $children_offset = ($theme->pagination->current_page -1) * $page_size ; - + admin || access::can("add", $item)): ?> diff --git a/themes/3nids/views/dynamic.html.php b/themes/3nids/views/dynamic.html.php index 775a4041..e32aad08 100755 --- a/themes/3nids/views/dynamic.html.php +++ b/themes/3nids/views/dynamic.html.php @@ -14,7 +14,7 @@
        - + $child): ?> @@ -22,7 +22,7 @@
      • thumb_top($child) ?> - + thumb_bottom($child) ?> context_menu($child, "#g-ItemId-{$child->id} .g-Thumbnail") ?>
        • @@ -30,7 +30,7 @@
      - + dynamic_bottom() ?> diff --git a/themes/3nids/views/image_block_block.html.php b/themes/3nids/views/image_block_block.html.php index 44a9667c..103be25d 100755 --- a/themes/3nids/views/image_block_block.html.php +++ b/themes/3nids/views/image_block_block.html.php @@ -1,3 +1,3 @@ - + diff --git a/themes/3nids/views/search.html.php b/themes/3nids/views/search.html.php index 53023377..909dbc03 100755 --- a/themes/3nids/views/search.html.php +++ b/themes/3nids/views/search.html.php @@ -13,19 +13,19 @@
        - +
      • thumb_top($child) ?> - + thumb_bottom($child) ?> context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?>
        • - +
      paginator() ?> From 9a7f7ff22d5ba9be7cd68be9e8c90e055c806e2d Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 27 Nov 2009 15:21:05 -0800 Subject: [PATCH 16/33] Rename "theme_3nids" to "3nids" in module vars. --- themes/3nids/controllers/admin_theme_3nids.php | 12 ++++++------ themes/3nids/controllers/photo_3nids.php | 2 +- themes/3nids/helpers/3nids.php | 4 ++-- themes/3nids/helpers/3nids_event.php | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/themes/3nids/controllers/admin_theme_3nids.php b/themes/3nids/controllers/admin_theme_3nids.php index 133bb143..8a306abf 100755 --- a/themes/3nids/controllers/admin_theme_3nids.php +++ b/themes/3nids/controllers/admin_theme_3nids.php @@ -41,13 +41,13 @@ class Admin_theme_3nids_Controller extends Admin_Controller { // Input box for the Maps API Key $form->input("title") ->label(t("item title : parent or item.")) - ->value(module::get_var("theme_3nids", "title")); + ->value(module::get_var("3nids", "title")); $form->input("description") ->label(t("item description : tags or item or parent or nothing. If item description chosen and not available, then parent description is used.")) - ->value(module::get_var("theme_3nids", "description")); + ->value(module::get_var("3nids", "description")); $form->input("photo_size") ->label(t("Photo size: resize or full.")) - ->value(module::get_var("theme_3nids", "photo_size")); + ->value(module::get_var("3nids", "photo_size")); // Add a save button to the form. $form->submit("SaveSettings")->value(t("Save")); @@ -68,9 +68,9 @@ class Admin_theme_3nids_Controller extends Admin_Controller { $photo_size = Input::instance()->post("photo_size"); // Save Settings. - module::set_var("theme_3nids", "description", $description); - module::set_var("theme_3nids", "title", $title); - module::set_var("theme_3nids", "photo_size", $photo_size); + module::set_var("3nids", "description", $description); + module::set_var("3nids", "title", $title); + module::set_var("3nids", "photo_size", $photo_size); // Display a success message and redirect back to the TagsMap admin page. message::success(t("Your Settings Have Been Saved.")); diff --git a/themes/3nids/controllers/photo_3nids.php b/themes/3nids/controllers/photo_3nids.php index 131c1f82..a294197e 100755 --- a/themes/3nids/controllers/photo_3nids.php +++ b/themes/3nids/controllers/photo_3nids.php @@ -25,7 +25,7 @@ class Photo_3nids_Controller extends Items_Controller { $view = new Theme_View("photo_3nids.html", "other", "page"); $view->item = $item; - $photo_size = module::get_var("theme_3nids","photo_size"); + $photo_size = module::get_var("3nids","photo_size"); if ($photo_size == "full"){ $view->item_url = $item->file_url(); } else { diff --git a/themes/3nids/helpers/3nids.php b/themes/3nids/helpers/3nids.php index f3751343..9c7d851c 100755 --- a/themes/3nids/helpers/3nids.php +++ b/themes/3nids/helpers/3nids.php @@ -58,12 +58,12 @@ class 3nids_Core { $rel = " rel=\"fancygroup\" "; } - if ($item->is_photo() || ($item->is_movie()) && module::is_active("theme_3nids")){ + if ($item->is_photo() || ($item->is_movie()) && module::is_active("3nids")){ $fancymodule = ""; if (module::is_active("exif")) { $fancymodule .= "exif::" . url::site("exif/show/{$item->id}") . ";;"; } - if (module::is_active("comment") && module::is_active("theme_3nids")) { + if (module::is_active("comment") && module::is_active("3nids")) { $fancymodule .= "comment::" . url::site("comments_3nids?item_id={$item->id}") . ";;comment_count::" . comment_3nids::count($item) . ";;"; } diff --git a/themes/3nids/helpers/3nids_event.php b/themes/3nids/helpers/3nids_event.php index 0e36dab0..1d0ac66c 100755 --- a/themes/3nids/helpers/3nids_event.php +++ b/themes/3nids/helpers/3nids_event.php @@ -22,7 +22,7 @@ class theme_3nids_event_Core { // Add a link to the TagsMap admin page to the Content menu. $menu->get("content_menu") ->append(Menu::factory("link") - ->id("theme_3nids") + ->id("3nids") ->label(t("Theme 3nids Settings")) ->url(url::site("admin/theme_3nids"))); } From 6c1c44fbec1b86c34948813a2a20a32ea2245cd6 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 27 Nov 2009 15:23:19 -0800 Subject: [PATCH 17/33] Can't have a class name that begins with a digit, so rename this back to theme_3nids. --- themes/3nids/helpers/{3nids.php => theme_3nids.php} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename themes/3nids/helpers/{3nids.php => theme_3nids.php} (99%) diff --git a/themes/3nids/helpers/3nids.php b/themes/3nids/helpers/theme_3nids.php similarity index 99% rename from themes/3nids/helpers/3nids.php rename to themes/3nids/helpers/theme_3nids.php index 9c7d851c..13cc67c7 100755 --- a/themes/3nids/helpers/3nids.php +++ b/themes/3nids/helpers/theme_3nids.php @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -class 3nids_Core { +class theme_3nids_Core { public function fancylink($item, $view_type="album", $group_img = true, $display_comment = true, $parent_title_class = "h2") { // view_type = album || dynamic || header From a13bf06f369af079ad9c2e5599648f89da3a29c7 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 27 Nov 2009 15:27:13 -0800 Subject: [PATCH 18/33] Change the mods on all files to 644 --- themes/3nids/README | 0 themes/3nids/controllers/admin_theme_3nids.php | 0 themes/3nids/controllers/comments_3nids.php | 0 themes/3nids/controllers/movie_3nids.php | 0 themes/3nids/controllers/photo_3nids.php | 0 themes/3nids/css/3nids.css | 0 themes/3nids/css/fix-ie.css | 0 themes/3nids/css/jquery.fancybox.css | 0 themes/3nids/css/screen.css | 0 .../images/ui-bg_flat_0_333333_40x100.png | Bin .../images/ui-bg_flat_0_484848_40x100.png | Bin .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin .../images/ui-bg_flat_100_000000_40x100.png | Bin .../images/ui-bg_flat_100_333333_40x100.png | Bin .../images/ui-bg_flat_100_484848_40x100.png | Bin .../images/ui-bg_flat_100_b30000_40x100.png | Bin .../images/ui-bg_flat_55_fbec88_40x100.png | Bin .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin .../images/ui-bg_gloss-wave_16_121212_500x100.png | Bin .../ui-bg_highlight-hard_100_333333_1x100.png | Bin .../images/ui-bg_highlight-hard_15_888888_1x100.png | Bin .../images/ui-bg_highlight-hard_55_555555_1x100.png | Bin .../images/ui-bg_highlight-soft_35_adadad_1x100.png | Bin .../images/ui-bg_highlight-soft_60_dddddd_1x100.png | Bin .../images/ui-bg_inset-soft_15_121212_1x100.png | Bin .../themeroller/images/ui-icons_222222_256x240.png | Bin .../themeroller/images/ui-icons_333333_256x240.png | Bin .../themeroller/images/ui-icons_444444_256x240.png | Bin .../themeroller/images/ui-icons_666666_256x240.png | Bin .../themeroller/images/ui-icons_aaaaaa_256x240.png | Bin .../themeroller/images/ui-icons_bbbbbb_256x240.png | Bin .../themeroller/images/ui-icons_cccccc_256x240.png | Bin .../themeroller/images/ui-icons_cd0a0a_256x240.png | Bin .../themeroller/images/ui-icons_f9bd01_256x240.png | Bin .../themeroller/images/ui-icons_f9db01_256x240.png | Bin themes/3nids/css/themeroller/ui.base.css | 0 themes/3nids/helpers/3nids_event.php | 0 themes/3nids/helpers/comment_3nids.php | 0 themes/3nids/helpers/theme_3nids.php | 4 ++-- themes/3nids/helpers/theme_3nids_theme.php | 0 themes/3nids/images/avatar.jpg | Bin themes/3nids/images/fancy_closebox.png | Bin themes/3nids/images/fancy_left.png | Bin themes/3nids/images/fancy_progress.png | Bin themes/3nids/images/fancy_right.png | Bin themes/3nids/images/fancy_shadow_e.png | Bin themes/3nids/images/fancy_shadow_n.png | Bin themes/3nids/images/fancy_shadow_ne.png | Bin themes/3nids/images/fancy_shadow_nw.png | Bin themes/3nids/images/fancy_shadow_s.png | Bin themes/3nids/images/fancy_shadow_se.png | Bin themes/3nids/images/fancy_shadow_sw.png | Bin themes/3nids/images/fancy_shadow_w.png | Bin themes/3nids/images/fancy_title_left.png | Bin themes/3nids/images/fancy_title_main.png | Bin themes/3nids/images/fancy_title_right.png | Bin themes/3nids/images/ico-album.png | Bin themes/3nids/images/ico-help.png | Bin themes/3nids/images/ico-print.png | Bin themes/3nids/images/ico-view-comments.png | Bin themes/3nids/images/ico-view-fullsize.png | Bin themes/3nids/images/ico-view-slideshow.png | Bin themes/3nids/images/map.png | Bin themes/3nids/images/select-photos-backg.png | Bin themes/3nids/js/jquery.easing.js | 0 themes/3nids/js/jquery.fancybox.js | 0 themes/3nids/js/ui.init.js | 0 themes/3nids/theme.info | 0 themes/3nids/thumbnail.png | Bin themes/3nids/views/admin_theme_3nids.html.php | 0 themes/3nids/views/album.html.php | 0 themes/3nids/views/block.html.php | 0 themes/3nids/views/comments.html.php | 0 themes/3nids/views/dynamic.html.php | 0 themes/3nids/views/exif_dialog.html.php | 0 themes/3nids/views/image_block_block.html.php | 0 themes/3nids/views/movie.html.php | 0 themes/3nids/views/movie_3nids.html.php | 0 themes/3nids/views/no_sidebar.html.php | 0 themes/3nids/views/page.html.php | 0 themes/3nids/views/paginator.html.php | 0 themes/3nids/views/photo_3nids.html.php | 0 themes/3nids/views/search.html.php | 0 themes/3nids/views/sidebar.html.php | 0 84 files changed, 2 insertions(+), 2 deletions(-) mode change 100755 => 100644 themes/3nids/README mode change 100755 => 100644 themes/3nids/controllers/admin_theme_3nids.php mode change 100755 => 100644 themes/3nids/controllers/comments_3nids.php mode change 100755 => 100644 themes/3nids/controllers/movie_3nids.php mode change 100755 => 100644 themes/3nids/controllers/photo_3nids.php mode change 100755 => 100644 themes/3nids/css/3nids.css mode change 100755 => 100644 themes/3nids/css/fix-ie.css mode change 100755 => 100644 themes/3nids/css/jquery.fancybox.css mode change 100755 => 100644 themes/3nids/css/screen.css mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-bg_flat_0_333333_40x100.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-bg_flat_0_484848_40x100.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-bg_flat_0_aaaaaa_40x100.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-bg_flat_100_000000_40x100.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-bg_flat_100_333333_40x100.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-bg_flat_100_484848_40x100.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-bg_flat_100_b30000_40x100.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-bg_flat_55_fbec88_40x100.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-bg_glass_95_fef1ec_1x400.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-bg_gloss-wave_16_121212_500x100.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-bg_highlight-hard_100_333333_1x100.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-bg_highlight-hard_15_888888_1x100.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-bg_highlight-hard_55_555555_1x100.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-bg_highlight-soft_35_adadad_1x100.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-bg_highlight-soft_60_dddddd_1x100.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-bg_inset-soft_15_121212_1x100.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-icons_222222_256x240.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-icons_333333_256x240.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-icons_444444_256x240.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-icons_666666_256x240.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-icons_aaaaaa_256x240.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-icons_bbbbbb_256x240.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-icons_cccccc_256x240.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-icons_cd0a0a_256x240.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-icons_f9bd01_256x240.png mode change 100755 => 100644 themes/3nids/css/themeroller/images/ui-icons_f9db01_256x240.png mode change 100755 => 100644 themes/3nids/css/themeroller/ui.base.css mode change 100755 => 100644 themes/3nids/helpers/3nids_event.php mode change 100755 => 100644 themes/3nids/helpers/comment_3nids.php mode change 100755 => 100644 themes/3nids/helpers/theme_3nids.php mode change 100755 => 100644 themes/3nids/helpers/theme_3nids_theme.php mode change 100755 => 100644 themes/3nids/images/avatar.jpg mode change 100755 => 100644 themes/3nids/images/fancy_closebox.png mode change 100755 => 100644 themes/3nids/images/fancy_left.png mode change 100755 => 100644 themes/3nids/images/fancy_progress.png mode change 100755 => 100644 themes/3nids/images/fancy_right.png mode change 100755 => 100644 themes/3nids/images/fancy_shadow_e.png mode change 100755 => 100644 themes/3nids/images/fancy_shadow_n.png mode change 100755 => 100644 themes/3nids/images/fancy_shadow_ne.png mode change 100755 => 100644 themes/3nids/images/fancy_shadow_nw.png mode change 100755 => 100644 themes/3nids/images/fancy_shadow_s.png mode change 100755 => 100644 themes/3nids/images/fancy_shadow_se.png mode change 100755 => 100644 themes/3nids/images/fancy_shadow_sw.png mode change 100755 => 100644 themes/3nids/images/fancy_shadow_w.png mode change 100755 => 100644 themes/3nids/images/fancy_title_left.png mode change 100755 => 100644 themes/3nids/images/fancy_title_main.png mode change 100755 => 100644 themes/3nids/images/fancy_title_right.png mode change 100755 => 100644 themes/3nids/images/ico-album.png mode change 100755 => 100644 themes/3nids/images/ico-help.png mode change 100755 => 100644 themes/3nids/images/ico-print.png mode change 100755 => 100644 themes/3nids/images/ico-view-comments.png mode change 100755 => 100644 themes/3nids/images/ico-view-fullsize.png mode change 100755 => 100644 themes/3nids/images/ico-view-slideshow.png mode change 100755 => 100644 themes/3nids/images/map.png mode change 100755 => 100644 themes/3nids/images/select-photos-backg.png mode change 100755 => 100644 themes/3nids/js/jquery.easing.js mode change 100755 => 100644 themes/3nids/js/jquery.fancybox.js mode change 100755 => 100644 themes/3nids/js/ui.init.js mode change 100755 => 100644 themes/3nids/theme.info mode change 100755 => 100644 themes/3nids/thumbnail.png mode change 100755 => 100644 themes/3nids/views/admin_theme_3nids.html.php mode change 100755 => 100644 themes/3nids/views/album.html.php mode change 100755 => 100644 themes/3nids/views/block.html.php mode change 100755 => 100644 themes/3nids/views/comments.html.php mode change 100755 => 100644 themes/3nids/views/dynamic.html.php mode change 100755 => 100644 themes/3nids/views/exif_dialog.html.php mode change 100755 => 100644 themes/3nids/views/image_block_block.html.php mode change 100755 => 100644 themes/3nids/views/movie.html.php mode change 100755 => 100644 themes/3nids/views/movie_3nids.html.php mode change 100755 => 100644 themes/3nids/views/no_sidebar.html.php mode change 100755 => 100644 themes/3nids/views/page.html.php mode change 100755 => 100644 themes/3nids/views/paginator.html.php mode change 100755 => 100644 themes/3nids/views/photo_3nids.html.php mode change 100755 => 100644 themes/3nids/views/search.html.php mode change 100755 => 100644 themes/3nids/views/sidebar.html.php diff --git a/themes/3nids/README b/themes/3nids/README old mode 100755 new mode 100644 diff --git a/themes/3nids/controllers/admin_theme_3nids.php b/themes/3nids/controllers/admin_theme_3nids.php old mode 100755 new mode 100644 diff --git a/themes/3nids/controllers/comments_3nids.php b/themes/3nids/controllers/comments_3nids.php old mode 100755 new mode 100644 diff --git a/themes/3nids/controllers/movie_3nids.php b/themes/3nids/controllers/movie_3nids.php old mode 100755 new mode 100644 diff --git a/themes/3nids/controllers/photo_3nids.php b/themes/3nids/controllers/photo_3nids.php old mode 100755 new mode 100644 diff --git a/themes/3nids/css/3nids.css b/themes/3nids/css/3nids.css old mode 100755 new mode 100644 diff --git a/themes/3nids/css/fix-ie.css b/themes/3nids/css/fix-ie.css old mode 100755 new mode 100644 diff --git a/themes/3nids/css/jquery.fancybox.css b/themes/3nids/css/jquery.fancybox.css old mode 100755 new mode 100644 diff --git a/themes/3nids/css/screen.css b/themes/3nids/css/screen.css old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-bg_flat_0_333333_40x100.png b/themes/3nids/css/themeroller/images/ui-bg_flat_0_333333_40x100.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-bg_flat_0_484848_40x100.png b/themes/3nids/css/themeroller/images/ui-bg_flat_0_484848_40x100.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-bg_flat_0_aaaaaa_40x100.png b/themes/3nids/css/themeroller/images/ui-bg_flat_0_aaaaaa_40x100.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-bg_flat_100_000000_40x100.png b/themes/3nids/css/themeroller/images/ui-bg_flat_100_000000_40x100.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-bg_flat_100_333333_40x100.png b/themes/3nids/css/themeroller/images/ui-bg_flat_100_333333_40x100.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-bg_flat_100_484848_40x100.png b/themes/3nids/css/themeroller/images/ui-bg_flat_100_484848_40x100.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-bg_flat_100_b30000_40x100.png b/themes/3nids/css/themeroller/images/ui-bg_flat_100_b30000_40x100.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-bg_flat_55_fbec88_40x100.png b/themes/3nids/css/themeroller/images/ui-bg_flat_55_fbec88_40x100.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-bg_glass_95_fef1ec_1x400.png b/themes/3nids/css/themeroller/images/ui-bg_glass_95_fef1ec_1x400.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-bg_gloss-wave_16_121212_500x100.png b/themes/3nids/css/themeroller/images/ui-bg_gloss-wave_16_121212_500x100.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-bg_highlight-hard_100_333333_1x100.png b/themes/3nids/css/themeroller/images/ui-bg_highlight-hard_100_333333_1x100.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-bg_highlight-hard_15_888888_1x100.png b/themes/3nids/css/themeroller/images/ui-bg_highlight-hard_15_888888_1x100.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-bg_highlight-hard_55_555555_1x100.png b/themes/3nids/css/themeroller/images/ui-bg_highlight-hard_55_555555_1x100.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-bg_highlight-soft_35_adadad_1x100.png b/themes/3nids/css/themeroller/images/ui-bg_highlight-soft_35_adadad_1x100.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-bg_highlight-soft_60_dddddd_1x100.png b/themes/3nids/css/themeroller/images/ui-bg_highlight-soft_60_dddddd_1x100.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-bg_inset-soft_15_121212_1x100.png b/themes/3nids/css/themeroller/images/ui-bg_inset-soft_15_121212_1x100.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-icons_222222_256x240.png b/themes/3nids/css/themeroller/images/ui-icons_222222_256x240.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-icons_333333_256x240.png b/themes/3nids/css/themeroller/images/ui-icons_333333_256x240.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-icons_444444_256x240.png b/themes/3nids/css/themeroller/images/ui-icons_444444_256x240.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-icons_666666_256x240.png b/themes/3nids/css/themeroller/images/ui-icons_666666_256x240.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-icons_aaaaaa_256x240.png b/themes/3nids/css/themeroller/images/ui-icons_aaaaaa_256x240.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-icons_bbbbbb_256x240.png b/themes/3nids/css/themeroller/images/ui-icons_bbbbbb_256x240.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-icons_cccccc_256x240.png b/themes/3nids/css/themeroller/images/ui-icons_cccccc_256x240.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-icons_cd0a0a_256x240.png b/themes/3nids/css/themeroller/images/ui-icons_cd0a0a_256x240.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-icons_f9bd01_256x240.png b/themes/3nids/css/themeroller/images/ui-icons_f9bd01_256x240.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/images/ui-icons_f9db01_256x240.png b/themes/3nids/css/themeroller/images/ui-icons_f9db01_256x240.png old mode 100755 new mode 100644 diff --git a/themes/3nids/css/themeroller/ui.base.css b/themes/3nids/css/themeroller/ui.base.css old mode 100755 new mode 100644 diff --git a/themes/3nids/helpers/3nids_event.php b/themes/3nids/helpers/3nids_event.php old mode 100755 new mode 100644 diff --git a/themes/3nids/helpers/comment_3nids.php b/themes/3nids/helpers/comment_3nids.php old mode 100755 new mode 100644 diff --git a/themes/3nids/helpers/theme_3nids.php b/themes/3nids/helpers/theme_3nids.php old mode 100755 new mode 100644 index 13cc67c7..d9582fd9 --- a/themes/3nids/helpers/theme_3nids.php +++ b/themes/3nids/helpers/theme_3nids.php @@ -68,11 +68,11 @@ class theme_3nids_Core { ";;comment_count::" . comment_3nids::count($item) . ";;"; } if ($item->is_photo()){ - $link .= "id}") ."/?w=" . $width . + $link .= "id}") ."/?w=" . $width . "xewx&h=" . $height . "xehx\" " . $rel . " class=\"fancyclass iframe\" title=\"" . $title . $description ."\" name=\"" . $fancymodule . " \">"; } else { - $link .= "id}") . "/?w=" . + $link .= "id}") . "/?w=" . strval(20 + $width) . "xewx&h=" . strval(50 + $height) . "xehx\" " . $rel . " class=\"fancyclass iframe\" title=\"" . $item->parent()->title . $description . "\" name=\"" . $fancymodule . " \">"; diff --git a/themes/3nids/helpers/theme_3nids_theme.php b/themes/3nids/helpers/theme_3nids_theme.php old mode 100755 new mode 100644 diff --git a/themes/3nids/images/avatar.jpg b/themes/3nids/images/avatar.jpg old mode 100755 new mode 100644 diff --git a/themes/3nids/images/fancy_closebox.png b/themes/3nids/images/fancy_closebox.png old mode 100755 new mode 100644 diff --git a/themes/3nids/images/fancy_left.png b/themes/3nids/images/fancy_left.png old mode 100755 new mode 100644 diff --git a/themes/3nids/images/fancy_progress.png b/themes/3nids/images/fancy_progress.png old mode 100755 new mode 100644 diff --git a/themes/3nids/images/fancy_right.png b/themes/3nids/images/fancy_right.png old mode 100755 new mode 100644 diff --git a/themes/3nids/images/fancy_shadow_e.png b/themes/3nids/images/fancy_shadow_e.png old mode 100755 new mode 100644 diff --git a/themes/3nids/images/fancy_shadow_n.png b/themes/3nids/images/fancy_shadow_n.png old mode 100755 new mode 100644 diff --git a/themes/3nids/images/fancy_shadow_ne.png b/themes/3nids/images/fancy_shadow_ne.png old mode 100755 new mode 100644 diff --git a/themes/3nids/images/fancy_shadow_nw.png b/themes/3nids/images/fancy_shadow_nw.png old mode 100755 new mode 100644 diff --git a/themes/3nids/images/fancy_shadow_s.png b/themes/3nids/images/fancy_shadow_s.png old mode 100755 new mode 100644 diff --git a/themes/3nids/images/fancy_shadow_se.png b/themes/3nids/images/fancy_shadow_se.png old mode 100755 new mode 100644 diff --git a/themes/3nids/images/fancy_shadow_sw.png b/themes/3nids/images/fancy_shadow_sw.png old mode 100755 new mode 100644 diff --git a/themes/3nids/images/fancy_shadow_w.png b/themes/3nids/images/fancy_shadow_w.png old mode 100755 new mode 100644 diff --git a/themes/3nids/images/fancy_title_left.png b/themes/3nids/images/fancy_title_left.png old mode 100755 new mode 100644 diff --git a/themes/3nids/images/fancy_title_main.png b/themes/3nids/images/fancy_title_main.png old mode 100755 new mode 100644 diff --git a/themes/3nids/images/fancy_title_right.png b/themes/3nids/images/fancy_title_right.png old mode 100755 new mode 100644 diff --git a/themes/3nids/images/ico-album.png b/themes/3nids/images/ico-album.png old mode 100755 new mode 100644 diff --git a/themes/3nids/images/ico-help.png b/themes/3nids/images/ico-help.png old mode 100755 new mode 100644 diff --git a/themes/3nids/images/ico-print.png b/themes/3nids/images/ico-print.png old mode 100755 new mode 100644 diff --git a/themes/3nids/images/ico-view-comments.png b/themes/3nids/images/ico-view-comments.png old mode 100755 new mode 100644 diff --git a/themes/3nids/images/ico-view-fullsize.png b/themes/3nids/images/ico-view-fullsize.png old mode 100755 new mode 100644 diff --git a/themes/3nids/images/ico-view-slideshow.png b/themes/3nids/images/ico-view-slideshow.png old mode 100755 new mode 100644 diff --git a/themes/3nids/images/map.png b/themes/3nids/images/map.png old mode 100755 new mode 100644 diff --git a/themes/3nids/images/select-photos-backg.png b/themes/3nids/images/select-photos-backg.png old mode 100755 new mode 100644 diff --git a/themes/3nids/js/jquery.easing.js b/themes/3nids/js/jquery.easing.js old mode 100755 new mode 100644 diff --git a/themes/3nids/js/jquery.fancybox.js b/themes/3nids/js/jquery.fancybox.js old mode 100755 new mode 100644 diff --git a/themes/3nids/js/ui.init.js b/themes/3nids/js/ui.init.js old mode 100755 new mode 100644 diff --git a/themes/3nids/theme.info b/themes/3nids/theme.info old mode 100755 new mode 100644 diff --git a/themes/3nids/thumbnail.png b/themes/3nids/thumbnail.png old mode 100755 new mode 100644 diff --git a/themes/3nids/views/admin_theme_3nids.html.php b/themes/3nids/views/admin_theme_3nids.html.php old mode 100755 new mode 100644 diff --git a/themes/3nids/views/album.html.php b/themes/3nids/views/album.html.php old mode 100755 new mode 100644 diff --git a/themes/3nids/views/block.html.php b/themes/3nids/views/block.html.php old mode 100755 new mode 100644 diff --git a/themes/3nids/views/comments.html.php b/themes/3nids/views/comments.html.php old mode 100755 new mode 100644 diff --git a/themes/3nids/views/dynamic.html.php b/themes/3nids/views/dynamic.html.php old mode 100755 new mode 100644 diff --git a/themes/3nids/views/exif_dialog.html.php b/themes/3nids/views/exif_dialog.html.php old mode 100755 new mode 100644 diff --git a/themes/3nids/views/image_block_block.html.php b/themes/3nids/views/image_block_block.html.php old mode 100755 new mode 100644 diff --git a/themes/3nids/views/movie.html.php b/themes/3nids/views/movie.html.php old mode 100755 new mode 100644 diff --git a/themes/3nids/views/movie_3nids.html.php b/themes/3nids/views/movie_3nids.html.php old mode 100755 new mode 100644 diff --git a/themes/3nids/views/no_sidebar.html.php b/themes/3nids/views/no_sidebar.html.php old mode 100755 new mode 100644 diff --git a/themes/3nids/views/page.html.php b/themes/3nids/views/page.html.php old mode 100755 new mode 100644 diff --git a/themes/3nids/views/paginator.html.php b/themes/3nids/views/paginator.html.php old mode 100755 new mode 100644 diff --git a/themes/3nids/views/photo_3nids.html.php b/themes/3nids/views/photo_3nids.html.php old mode 100755 new mode 100644 diff --git a/themes/3nids/views/search.html.php b/themes/3nids/views/search.html.php old mode 100755 new mode 100644 diff --git a/themes/3nids/views/sidebar.html.php b/themes/3nids/views/sidebar.html.php old mode 100755 new mode 100644 From 7f3c8db181f4fa9cf0cd0fd9bb6ad688b259d9ea Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 27 Nov 2009 15:32:01 -0800 Subject: [PATCH 19/33] Fix indentation. --- themes/3nids/views/photo.html.php | 94 ++++++++++++------------------- 1 file changed, 36 insertions(+), 58 deletions(-) diff --git a/themes/3nids/views/photo.html.php b/themes/3nids/views/photo.html.php index a748daf2..37c07c44 100644 --- a/themes/3nids/views/photo.html.php +++ b/themes/3nids/views/photo.html.php @@ -1,59 +1,37 @@ - -item())): ?> - - - - -
      - photo_top() ?> - - - -
      - resize_top($item) ?> - - for_html_attr() ?>"> - - resize_img(array("id" => "g-photo-id-{$item->id}", "class" => "g-resize")) ?> - - - - resize_bottom($item) ?> - context_menu($item, "#g-photo-id-{$item->id}") ?> -
      - -
      -

      title) ?>

      -
      description)) ?>
      -
      - - photo_bottom() ?> -
      + + + + + css("yui/reset-fonts-grids.css") ?> + css("superfish/css/superfish.css") ?> + css("themeroller/ui.base.css") ?> + css("gallery.common.css") ?> + css("jquery.fancybox.css") ?> + css("screen.css") ?> + css("3nids.css") ?> + script("jquery.js") ?> + script("jquery.form.js") ?> + script("jquery-ui.js") ?> + script("gallery.common.js") ?> + + + script("gallery.ajax.js") ?> + script("gallery.dialog.js") ?> + script("superfish/js/superfish.js") ?> + script("jquery.localscroll.js") ?> + script("jquery.easing.js") ?> + script("jquery.fancybox.js") ?> + script("ui.init.js") ?> + head() ?> + + +
      + + context_menu($item, "#g-item-id-{$item->id}") ?> +
      + + From 481da56ead6d71d767cf9a875f854f771556e1a9 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 27 Nov 2009 15:34:48 -0800 Subject: [PATCH 20/33] Get rid of the specialized photos_3nids controller and use the base photos controller. Override photo.html.php to do the simplified rendering of the image in a lightbox. --- themes/3nids/controllers/photo_3nids.php | 36 ---------------------- themes/3nids/views/page.html.php | 13 +++++--- themes/3nids/views/photo.html.php | 7 ++++- themes/3nids/views/photo_3nids.html.php | 38 ------------------------ 4 files changed, 15 insertions(+), 79 deletions(-) delete mode 100644 themes/3nids/controllers/photo_3nids.php delete mode 100644 themes/3nids/views/photo_3nids.html.php diff --git a/themes/3nids/controllers/photo_3nids.php b/themes/3nids/controllers/photo_3nids.php deleted file mode 100644 index a294197e..00000000 --- a/themes/3nids/controllers/photo_3nids.php +++ /dev/null @@ -1,36 +0,0 @@ -item = $item; - $photo_size = module::get_var("3nids","photo_size"); - if ($photo_size == "full"){ - $view->item_url = $item->file_url(); - } else { - $view->item_url = $item->resize_url(); - } - print $view; - } -} \ No newline at end of file diff --git a/themes/3nids/views/page.html.php b/themes/3nids/views/page.html.php index 9658873e..fdb24fd4 100644 --- a/themes/3nids/views/page.html.php +++ b/themes/3nids/views/page.html.php @@ -1,4 +1,9 @@ + + + + + @@ -28,7 +33,7 @@ css("superfish/css/superfish.css") ?> css("themeroller/ui.base.css") ?> css("gallery.common.css") ?> - css("jquery.fancybox.css") ?> + css("jquery.fancybox.css") ?> css("screen.css") ?> css("3nids.css") ?>
    • thumb_top($child) ?> - + thumb_bottom($child) ?> context_menu($child, "#g-ItemId-{$child->id} .g-Thumbnail") ?>
      • @@ -30,7 +30,7 @@
    - + dynamic_bottom() ?> diff --git a/themes/3nids/views/exif_dialog.html.php b/themes/three_nids/views/exif_dialog.html.php similarity index 100% rename from themes/3nids/views/exif_dialog.html.php rename to themes/three_nids/views/exif_dialog.html.php diff --git a/themes/three_nids/views/image_block_block.html.php b/themes/three_nids/views/image_block_block.html.php new file mode 100644 index 00000000..bbe6062b --- /dev/null +++ b/themes/three_nids/views/image_block_block.html.php @@ -0,0 +1,3 @@ + + + diff --git a/themes/3nids/views/movie.html.php b/themes/three_nids/views/movie.html.php similarity index 97% rename from themes/3nids/views/movie.html.php rename to themes/three_nids/views/movie.html.php index efc3d89b..3ebe0632 100644 --- a/themes/3nids/views/movie.html.php +++ b/themes/three_nids/views/movie.html.php @@ -10,7 +10,7 @@ css("gallery.common.css") ?> css("jquery.fancybox.css") ?> css("screen.css") ?> - css("3nids.css") ?> + css("three_nids.css") ?> script("jquery.js") ?> script("jquery.form.js") ?> script("jquery-ui.js") ?> diff --git a/themes/3nids/views/no_sidebar.html.php b/themes/three_nids/views/no_sidebar.html.php similarity index 100% rename from themes/3nids/views/no_sidebar.html.php rename to themes/three_nids/views/no_sidebar.html.php diff --git a/themes/3nids/views/page.html.php b/themes/three_nids/views/page.html.php similarity index 99% rename from themes/3nids/views/page.html.php rename to themes/three_nids/views/page.html.php index 0de01788..8a39fbc4 100644 --- a/themes/3nids/views/page.html.php +++ b/themes/three_nids/views/page.html.php @@ -36,7 +36,7 @@ css("gallery.common.css") ?> css("jquery.fancybox.css") ?> css("screen.css") ?> - css("3nids.css") ?> + css("three_nids.css") ?>
  • thumb_top($child) ?> - + thumb_bottom($child) ?> context_menu($child, "#g-ItemId-{$child->id} .g-Thumbnail") ?>
    • @@ -30,7 +30,7 @@ - + dynamic_bottom() ?> diff --git a/themes/three_nids/views/image_block_block.html.php b/themes/three_nids/views/image_block_block.html.php index bbe6062b..0b56af20 100644 --- a/themes/three_nids/views/image_block_block.html.php +++ b/themes/three_nids/views/image_block_block.html.php @@ -1,3 +1,3 @@ - + diff --git a/themes/three_nids/views/search.html.php b/themes/three_nids/views/search.html.php index 6c38deb1..0699decd 100644 --- a/themes/three_nids/views/search.html.php +++ b/themes/three_nids/views/search.html.php @@ -13,19 +13,19 @@
      - +
    • thumb_top($child) ?> - + thumb_bottom($child) ?> context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?>
      • - +
    paginator() ?> From bed8f8456631df3427c938577b0b9c2024ff73d2 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 27 Nov 2009 16:31:15 -0800 Subject: [PATCH 27/33] Whitespace. --- themes/three_nids/helpers/three_nids.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/themes/three_nids/helpers/three_nids.php b/themes/three_nids/helpers/three_nids.php index 5d93a7f6..bb543408 100644 --- a/themes/three_nids/helpers/three_nids.php +++ b/themes/three_nids/helpers/three_nids.php @@ -38,7 +38,7 @@ class three_nids_Core { $description = ""; $tags = tag::item_tags($item); if(count($tags) && $description_mode == "tags"){ - $description = " || " . implode(", ", $tags); + $description = " || " . implode(", ", $tags); } else if ($description_mode == "item" && $item->description != ""){ $description = " || " . str_replace("\"",""",$item->description); } else if (($description_mode == "parent" || @@ -70,12 +70,12 @@ class three_nids_Core { if ($item->is_photo()){ $link .= "id}") ."/?w=" . $width . "xewx&h=" . $height . "xehx\" " . $rel . " class=\"fancyclass iframe\" title=\"" . - $title . $description ."\" name=\"" . $fancymodule . " \">"; + $title . $description ."\" name=\"" . $fancymodule . " \">"; } else { $link .= "id}") . "/?w=" . strval(20 + $width) . "xewx&h=" . strval(50 + $height) . "xehx\" " . $rel . " class=\"fancyclass iframe\" title=\"" . $item->parent()->title . $description . - "\" name=\"" . $fancymodule . " \">"; + "\" name=\"" . $fancymodule . " \">"; } } else if ($item->is_album() && $view_type != "header") { $link .= "url() . "\">"; @@ -89,11 +89,11 @@ class three_nids_Core { if ($view_type != "header") { $link .= $item->thumb_img(array("class" => "g-thumbnail")) . ""; - if ($item->is_album() && $view_type == "album") { + if ($item->is_album() && $view_type == "album") { $link .= "url() . "?show=" . $item->id . "\"><$parent_title_class>" . html::clean($item->title) . ""; - } else if (!($item->is_album()) && $view_type == "dynamic") { + } else if (!($item->is_album()) && $view_type == "dynamic") { $link .= "parent()->url() . "?show=" . $item->id . "\" class=\"g-parent-album\"><$parent_title_class>" . html::clean($item->parent()->title) . ""; From fbe35b165860237ae903c8ca4e5e4b665c5dfdb8 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 27 Nov 2009 16:33:33 -0800 Subject: [PATCH 28/33] Fix indentation. --- themes/three_nids/views/comments.html.php | 70 ++++++++++++----------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/themes/three_nids/views/comments.html.php b/themes/three_nids/views/comments.html.php index b2adfd05..b005ff17 100644 --- a/themes/three_nids/views/comments.html.php +++ b/themes/three_nids/views/comments.html.php @@ -2,13 +2,13 @@ - - + + css("yui/reset-fonts-grids.css") ?> css("superfish/css/superfish.css") ?> css("themeroller/ui.base.css") ?> css("gallery.common.css") ?> - css("jquery.fancybox.css") ?> + css("jquery.fancybox.css") ?> css("screen.css") ?> css("three_nids.css") ?> script("jquery.js") ?> @@ -17,42 +17,44 @@ script("gallery.common.js") ?> script("gallery.ajax.js") ?> script("gallery.dialog.js") ?> script("superfish/js/superfish.js") ?> script("jquery.localscroll.js") ?> - script("jquery.easing.js") ?> + script("jquery.easing.js") ?> script("jquery.fancybox.js") ?> script("ui.init.js") ?> -head() ?> - - -
    - " id="g-admin-comment-button" - class="g-button ui-corner-all ui-icon-left ui-state-default right"> - - - -
    - count()): ?> -

    - -

    - -
      - -
    • - %name %date: ', - array("date" => date(module::get_var("gallery", "date_time_format", "Y-M-d H:i:s"), $comment->created), - "name" => html::clean($comment->author_name()))); ?> -
      - text)) ?> -
      -
      • - -
    -
    - + head() ?> + + +
    + +
    + " id="g-admin-comment-button" + class="g-button ui-corner-all ui-icon-left ui-state-default right"> + + + +
    + count()): ?> +

    + +

    + +
      + +
    • + %name %date: ', + array("date" => date(module::get_var("gallery", "date_time_format", "Y-M-d H:i:s"), $comment->created), + "name" => html::clean($comment->author_name()))); ?> +
      + text)) ?> +
      +
      • + +
    +
    + From 2080cc531e27912d5f45793a07a41edd82aeeb03 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 27 Nov 2009 16:55:00 -0800 Subject: [PATCH 29/33] Roll comment functionality into the three_nids controllers and helpers. --- .../three_nids/controllers/comments_3nids.php | 186 ------------------ themes/three_nids/controllers/three_nids.php | 36 ++++ .../three_nids/helpers/comment_three_nids.php | 128 ------------ themes/three_nids/helpers/three_nids.php | 18 +- themes/three_nids/views/comments.html.php | 4 +- 5 files changed, 52 insertions(+), 320 deletions(-) delete mode 100644 themes/three_nids/controllers/comments_3nids.php create mode 100644 themes/three_nids/controllers/three_nids.php delete mode 100644 themes/three_nids/helpers/comment_three_nids.php diff --git a/themes/three_nids/controllers/comments_3nids.php b/themes/three_nids/controllers/comments_3nids.php deleted file mode 100644 index 4a59b9bc..00000000 --- a/themes/three_nids/controllers/comments_3nids.php +++ /dev/null @@ -1,186 +0,0 @@ -input->get('item_id'); - $item = ORM::factory("item", $item_id); - access::required("view", $item); - - $comments = ORM::factory("comment") - ->where("item_id", $item->id) - ->where("state", "published") - ->orderby("created", "ASC") - ->find_all(); - - switch (rest::output_format()) { - case "json": - foreach ($comments as $comment) { - $data[] = array( - "id" => $comment->id, - "author_name" => html::clean($comment->author_name()), - "created" => $comment->created, - "text" => nl2br(html::purify($comment->text))); - } - print json_encode($data); - break; - - case "html": - $view = new Theme_View("comments.html", "other", "page"); - $view->comments = $comments; - $view->item_id = $item_id; - $view->thumb = $item->thumb_url(); - print $view; - break; - } - } - - /** - * Add a new comment to the collection. - * @see REST_Controller::_create($resource) - */ - public function _create($comment) { - $item = ORM::factory("item", $this->input->post("item_id")); - access::required("view", $item); - - $form = comment_three_nids::get_add_form($item); - $valid = $form->validate(); - if ($valid) { - if (user::active()->guest && !$form->add_comment->inputs["name"]->value) { - $form->add_comment->inputs["name"]->add_error("missing", 1); - $valid = false; - } - - if (!$form->add_comment->text->value) { - $form->add_comment->text->add_error("missing", 1); - $valid = false; - } - } - - if ($valid) { - $comment = comment::create( - $item, user::active(), - $form->add_comment->text->value, - $form->add_comment->inputs["name"]->value, - $form->add_comment->email->value, - $form->add_comment->url->value); - - $active = user::active(); - if ($active->guest) { - $form->add_comment->inputs["name"]->value(""); - $form->add_comment->email->value(""); - $form->add_comment->url->value(""); - } else { - $form->add_comment->inputs["name"]->value($active->full_name); - $form->add_comment->email->value($active->email); - $form->add_comment->url->value($active->url); - } - } - url::redirect(url::site("comments_three_nids?item_id=".$item->id)); -} - /** - * Display an existing comment. - * @todo Set proper Content-Type in a central place (REST_Controller::dispatch?). - * @see REST_Controller::_show($resource) - */ - public function _show($comment) { - $item = ORM::factory("item", $comment->item_id); - access::required("view", $item); - if ($comment->state != "published") { - return; - } - - if (rest::output_format() == "json") { - print json_encode( - array("result" => "success", - "data" => array( - "id" => $comment->id, - "author_name" => html::clean($comment->author_name()), - "created" => $comment->created, - "text" => nl2br(html::purify($comment->text))))); - } else { - $view = new Theme_View("comment.html", "other", "fragment"); - $view->comment = $comment; - print $view; - } - } - - /** - * Change an existing comment. - * @see REST_Controller::_update($resource) - */ - public function _update($comment) { - $item = ORM::factory("item", $comment->item_id); - access::required("view", $item); - access::required("edit", $item); - - $form = comment_three_nids::get_edit_form($comment); - if ($form->validate()) { - $comment->guest_name = $form->edit_comment->inputs["name"]->value; - $comment->guest_email = $form->edit_comment->email->value; - $comment->url = $form->edit_comment->url->value; - $comment->text = $form->edit_comment->text->value; - $comment->save(); - - print json_encode( - array("result" => "success", - "resource" => url::site("comments/{$comment->id}"))); - } else { - print json_encode( - array("result" => "error", - "html" => $form->__toString())); - } - } - - /** - * Delete existing comment. - * @see REST_Controller::_delete($resource) - */ - public function _delete($comment) { - $item = ORM::factory("item", $comment->item_id); - access::required("view", $item); - access::required("edit", $item); - - $comment->delete(); - print json_encode(array("result" => "success")); - } - - /** - * Present a form for adding a new comment to this item or editing an existing comment. - * @see REST_Controller::form_add($resource) - */ - public function _form_add($item_id) { - $item = ORM::factory("item", $item_id); - access::required("view", $item); - - print comment_three_nids::get_add_form($item); - } - - /** - * Present a form for editing an existing comment. - * @see REST_Controller::form_edit($resource) - */ - public function _form_edit($comment) { - if (!user::active()->admin) { - access::forbidden(); - } - print comment_three_nids::get_edit_form($comment); - } -} diff --git a/themes/three_nids/controllers/three_nids.php b/themes/three_nids/controllers/three_nids.php new file mode 100644 index 00000000..465b8345 --- /dev/null +++ b/themes/three_nids/controllers/three_nids.php @@ -0,0 +1,36 @@ +where("item_id", $item->id) + ->where("state", "published") + ->orderby("created", "ASC") + ->find_all(); + + $v = new Theme_View("comments.html", "other", "comment-fragment"); + $v->comments = $comments; + $v->item = $item; + print $v; + } +} diff --git a/themes/three_nids/helpers/comment_three_nids.php b/themes/three_nids/helpers/comment_three_nids.php deleted file mode 100644 index c568824b..00000000 --- a/themes/three_nids/helpers/comment_three_nids.php +++ /dev/null @@ -1,128 +0,0 @@ -where("item_id", $item->id) - ->where("state", "published") - ->orderby("created", "DESC") - ->find_all(); - - return $comments->count(); - } - - /** - * Create a new comment. - * @param Item_MOdel $item the parent item - * @param User_Model $author the author User_Model - * @param string $text comment body - * @param string $guest_name guest's name (if the author is a guest user, default empty) - * @param string $guest_email guest's email (if the author is a guest user, default empty) - * @param string $guest_url guest's url (if the author is a guest user, default empty) - * @return Comment_Model - */ - static function create($item, $author, $text, $guest_name=null, - $guest_email=null, $guest_url=null) { - $comment = ORM::factory("comment"); - $comment->author_id = $author->id; - $comment->guest_email = $guest_email; - $comment->guest_name = $guest_name; - $comment->guest_url = $guest_url; - $comment->item_id = $item->id; - $comment->text = $text; - $comment->state = "published"; - - // These values are useful for spam fighting, so save them with the comment. - $input = Input::instance(); - $comment->server_http_accept = substr($input->server("HTTP_ACCEPT"), 0, 128); - $comment->server_http_accept_charset = substr($input->server("HTTP_ACCEPT_CHARSET"), 0, 64); - $comment->server_http_accept_encoding = substr($input->server("HTTP_ACCEPT_ENCODING"), 0, 64); - $comment->server_http_accept_language = substr($input->server("HTTP_ACCEPT_LANGUAGE"), 0, 64); - $comment->server_http_connection = substr($input->server("HTTP_CONNECTION"), 0, 64); - $comment->server_http_host = substr($input->server("HTTP_HOST"), 0, 64); - $comment->server_http_referer = substr($input->server("HTTP_REFERER"), 0, 255); - $comment->server_http_user_agent = substr($input->server("HTTP_USER_AGENT"), 0, 128); - $comment->server_query_string = substr($input->server("QUERY_STRING"), 0, 64); - $comment->server_remote_addr = substr($input->server("REMOTE_ADDR"), 0, 32); - $comment->server_remote_host = substr($input->server("REMOTE_HOST"), 0, 64); - $comment->server_remote_port = substr($input->server("REMOTE_PORT"), 0, 16); - $comment->save(); - - return $comment; - } - - static function get_add_form($item) { - $form = new Forge("comments_three_nids?item_id=".$item->id, "", "post", array("id" => "gAddCommentForm")); - $group = $form->group("add_comment")->label(t("Add comment")); - $group->input("name") ->label(t("Name")) ->id("gAuthor"); - $group->input("email") ->label(t("Email (hidden)")) ->id("gEmail"); - $group->input("url") ->label(t("Website (hidden)"))->id("gUrl"); - $group->textarea("text")->label(t("Comment")) ->id("gText"); - $group->hidden("item_id")->value($item->id); - module::event("comment_add_form", $form); - $group->submit("")->value(t("Add")) ->class("gButtonLink ui-corner-all ui-icon-left ui-state-default"); - - $active = user::active(); - if (!$active->guest) { - $group->inputs["name"]->value($active->full_name)->disabled("disabled"); - $group->email->value($active->email)->disabled("disabled"); - $group->url->value($active->url)->disabled("disabled"); - } else { - $group->inputs["name"]->error_messages("missing", t("You must provide a name")); - } - $group->text->error_messages("missing", t("You must provide a comment")); - - return $form; - } - - static function get_edit_form($comment) { - $form = new Forge("comments/{$comment->id}?_method=put", "", "post", - array("id" => "gEditCommentForm")); - $group = $form->group("edit_comment")->label(t("Edit comment")); - $group->input("name") ->label(t("Author")) ->id("gAuthor"); - $group->input("email") ->label(t("Email (hidden)")) ->id("gEmail"); - $group->input("url") ->label(t("Website (hidden)"))->id("gUrl"); - $group->textarea("text")->label(t("Comment")) ->id("gText"); - $group->submit("")->value(t("Edit")); - - $group->text = $comment->text; - $author = $comment->author(); - if ($author->guest) { - $group->inputs["name"]->value = $comment->guest_name; - $group->email = $comment->guest_email; - $group->url = $comment->guest_url; - } else { - $group->inputs["name"]->value($author->full_name)->disabled("disabled"); - $group->email->value($author->email)->disabled("disabled"); - $group->url->value($author->url)->disabled("disabled"); - } - return $form; - } -} - diff --git a/themes/three_nids/helpers/three_nids.php b/themes/three_nids/helpers/three_nids.php index bb543408..29042ff2 100644 --- a/themes/three_nids/helpers/three_nids.php +++ b/themes/three_nids/helpers/three_nids.php @@ -64,8 +64,8 @@ class three_nids_Core { $fancymodule .= "exif::" . url::site("exif/show/{$item->id}") . ";;"; } if (module::is_active("comment")) { - $fancymodule .= "comment::" . url::site("comments_three_nids?item_id={$item->id}") . - ";;comment_count::" . comment_three_nids::count($item) . ";;"; + $fancymodule .= "comment::" . url::site("three_nids/show_comments/{$item->id}") . + ";;comment_count::" . three_nids::comment_count($item) . ";;"; } if ($item->is_photo()){ $link .= "id}") ."/?w=" . $width . @@ -102,8 +102,8 @@ class three_nids_Core { if (($item->is_photo() || $item->is_movie()) && $display_comment && module::is_active("comment")) { $link .= ""; } } else { @@ -111,5 +111,15 @@ class three_nids_Core { } return $link; } + + public function comment_count($item) { + access::required("view", $item); + + return ORM::factory("comment") + ->where("item_id", $item->id) + ->where("state", "published") + ->orderby("created", "DESC") + ->count_all(); + } } ?> \ No newline at end of file diff --git a/themes/three_nids/views/comments.html.php b/themes/three_nids/views/comments.html.php index b005ff17..01eeadd3 100644 --- a/themes/three_nids/views/comments.html.php +++ b/themes/three_nids/views/comments.html.php @@ -30,9 +30,9 @@
    - + thumb_img() ?>
    - " id="g-admin-comment-button" + id}") ?>" id="g-admin-comment-button" class="g-button ui-corner-all ui-icon-left ui-state-default right"> From b5414d7aa56887dca5f23f4e82d81a5237f9bc1b Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 27 Nov 2009 16:59:07 -0800 Subject: [PATCH 30/33] Rename and fix up some indentation. --- ...n_theme_3nids.php => admin_three_nids.php} | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) rename themes/three_nids/controllers/{admin_theme_3nids.php => admin_three_nids.php} (81%) diff --git a/themes/three_nids/controllers/admin_theme_3nids.php b/themes/three_nids/controllers/admin_three_nids.php similarity index 81% rename from themes/three_nids/controllers/admin_theme_3nids.php rename to themes/three_nids/controllers/admin_three_nids.php index 7f586fd5..fb5fd67a 100644 --- a/themes/three_nids/controllers/admin_theme_3nids.php +++ b/themes/three_nids/controllers/admin_three_nids.php @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -class Admin_three_nids_Controller extends Admin_Controller { +class Admin_Three_Nids_Controller extends Admin_Controller { public function index() { // Generate a new admin page. $view = new Admin_View("admin.html"); @@ -26,13 +26,11 @@ class Admin_three_nids_Controller extends Admin_Controller { // Generate a form for Google Maps Settings. $view->content->theme_form = $this->_get_three_nids_form(); - // Display the page. print $view; } - private function _get_three_nids_form() { // Make a new form for inputing information associated with google maps. $form = new Forge("admin/three_nids/savethree_nidsprefs", "", "post", @@ -40,14 +38,14 @@ class Admin_three_nids_Controller extends Admin_Controller { // Input box for the Maps API Key $form->input("title") - ->label(t("item title : parent or item.")) - ->value(module::get_var("three_nids", "title")); + ->label(t("item title : parent or item.")) + ->value(module::get_var("three_nids", "title")); $form->input("description") - ->label(t("item description : tags or item or parent or nothing. If item description chosen and not available, then parent description is used.")) - ->value(module::get_var("three_nids", "description")); + ->label(t("item description : tags or item or parent or nothing. If item description chosen and not available, then parent description is used.")) + ->value(module::get_var("three_nids", "description")); $form->input("photo_size") - ->label(t("Photo size: resize or full.")) - ->value(module::get_var("three_nids", "photo_size")); + ->label(t("Photo size: resize or full.")) + ->value(module::get_var("three_nids", "photo_size")); // Add a save button to the form. $form->submit("SaveSettings")->value(t("Save")); @@ -55,7 +53,7 @@ class Admin_three_nids_Controller extends Admin_Controller { // Return the newly generated form. return $form; } - + public function savethree_nidsprefs() { // Save information associated with Google Maps to the database. @@ -66,7 +64,7 @@ class Admin_three_nids_Controller extends Admin_Controller { $description = Input::instance()->post("description"); $title = Input::instance()->post("title"); $photo_size = Input::instance()->post("photo_size"); - + // Save Settings. module::set_var("three_nids", "description", $description); module::set_var("three_nids", "title", $title); From 78e6c5434eedac1e38f6d67f18d4733d2b2fabf0 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 28 Nov 2009 15:20:10 -0800 Subject: [PATCH 31/33] Move the 3nids admin menu option into the appearance menu. --- themes/three_nids/helpers/three_nids_event.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/three_nids/helpers/three_nids_event.php b/themes/three_nids/helpers/three_nids_event.php index 78a79f77..bd91b1b1 100644 --- a/themes/three_nids/helpers/three_nids_event.php +++ b/themes/three_nids/helpers/three_nids_event.php @@ -20,10 +20,10 @@ class three_nids_event_Core { static function admin_menu($menu, $theme) { // Add a link to the three_nids admin page to the Content menu. - $menu->get("content_menu") + $menu->get("appearance_menu") ->append(Menu::factory("link") ->id("three_nids") - ->label(t("three_nids Settings")) + ->label(t("3nids settings")) ->url(url::site("admin/three_nids"))); } } \ No newline at end of file From e12cc3dd2f3aac5c2480b9e3d2d38281789c0cb8 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 28 Nov 2009 23:30:33 -0800 Subject: [PATCH 32/33] Move admin related controllers, views and helpers into the admin subdirectory so that they're accessible in admin mode. --- .../controllers/admin_three_nids.php | 0 .../admin/helpers/three_nids_event.php | 29 +++++++++++++++++++ .../views/admin_three_nids.html.php} | 0 3 files changed, 29 insertions(+) rename themes/three_nids/{ => admin}/controllers/admin_three_nids.php (100%) create mode 100644 themes/three_nids/admin/helpers/three_nids_event.php rename themes/three_nids/{views/admin_theme_3nids.html.php => admin/views/admin_three_nids.html.php} (100%) diff --git a/themes/three_nids/controllers/admin_three_nids.php b/themes/three_nids/admin/controllers/admin_three_nids.php similarity index 100% rename from themes/three_nids/controllers/admin_three_nids.php rename to themes/three_nids/admin/controllers/admin_three_nids.php diff --git a/themes/three_nids/admin/helpers/three_nids_event.php b/themes/three_nids/admin/helpers/three_nids_event.php new file mode 100644 index 00000000..bd91b1b1 --- /dev/null +++ b/themes/three_nids/admin/helpers/three_nids_event.php @@ -0,0 +1,29 @@ +get("appearance_menu") + ->append(Menu::factory("link") + ->id("three_nids") + ->label(t("3nids settings")) + ->url(url::site("admin/three_nids"))); + } +} \ No newline at end of file diff --git a/themes/three_nids/views/admin_theme_3nids.html.php b/themes/three_nids/admin/views/admin_three_nids.html.php similarity index 100% rename from themes/three_nids/views/admin_theme_3nids.html.php rename to themes/three_nids/admin/views/admin_three_nids.html.php From bc1f03996aeae6846f4d1c19bc74fadc6ac171e8 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sun, 29 Nov 2009 00:08:00 -0800 Subject: [PATCH 33/33] Tighten up the text a bit. --- themes/three_nids/admin/views/admin_three_nids.html.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/themes/three_nids/admin/views/admin_three_nids.html.php b/themes/three_nids/admin/views/admin_three_nids.html.php index f6471ddf..3d8c8878 100644 --- a/themes/three_nids/admin/views/admin_three_nids.html.php +++ b/themes/three_nids/admin/views/admin_three_nids.html.php @@ -1,11 +1,8 @@ -

    - -

    +

    + +

    -

    - -