diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..dbf1b472 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +.DS_Store +tmp +*~ +*.swp diff --git a/client/Gallery3.php b/client/Gallery3.php index 991e85de..d1135ae9 100644 --- a/client/Gallery3.php +++ b/client/Gallery3.php @@ -69,7 +69,7 @@ class Gallery3 { } /** - * Set a value on the remote resource. You must call save for it to take effect. + * Set a value on the remote resource's entity. You must call save for it to take effect. * * @param string key * @param string value @@ -81,6 +81,18 @@ class Gallery3 { return $this; } + /** + * Replace the members for the remote resource + * + * @param array members + * @return object Gallery3 + * @chainable + */ + public function set_members($members) { + $this->data->members = $members; + return $this; + } + /** * Attach a file to the remote resource. * @@ -99,8 +111,12 @@ class Gallery3 { * @return object Gallery3 */ public function create($url, $token) { + if (!is_string($url)) { + throw new Gallery3_Exception("Invalid url: " . var_export($url)); + } + $response = Gallery3_Helper::request( - "post", $url, $token, $this->data->entity, $this->file); + "post", $url, $token, array("entity" => $this->data->entity), $this->file); $this->url = $response->url; $this->token = $token; return $this->load(); @@ -115,7 +131,8 @@ class Gallery3 { public function save() { $response = Gallery3_Helper::request( "put", $this->url, $this->token, - array_diff($this->original_entity, (array)$this->data->entity)); + array("entity" => array_diff((array)$this->data->entity, $this->original_entity), + "members" => $this->data->members)); return $this->load(); } @@ -140,7 +157,7 @@ class Gallery3 { public function load() { $response = Gallery3_Helper::request("get", $this->url, $this->token); $this->data = $response; - $this->original_entity = (array)$response->entity; + $this->original_entity = isset($response->entity) ? (array)$response->entity : null; return $this; } } @@ -154,7 +171,7 @@ class Gallery3_Helper { $req->addHeader("X-Gallery-Request-Key", $token); } foreach ($params as $key => $value) { - $req->addPostData($key, $value); + $req->addPostData($key, is_string($value) ? $value : json_encode($value)); } if ($file) { $req->addFile("file", $file, mime_content_type($file)); @@ -163,6 +180,7 @@ class Gallery3_Helper { switch ($req->getResponseCode()) { case 200: + case 201: return json_decode($req->getResponseBody()); case 403: diff --git a/client/example.php b/client/example.php index 7a9c8a27..1c96cd1b 100644 --- a/client/example.php +++ b/client/example.php @@ -13,13 +13,13 @@ alert("Connect to $SITE_URL"); $auth = Gallery3::login($SITE_URL, $USER, $PASSWORD); $root = Gallery3::factory("$SITE_URL/item/1", $auth); $tags = Gallery3::factory("$SITE_URL/tags", $auth); +$comments = Gallery3::factory("$SITE_URL/comments", $auth); $tag = Gallery3::factory() ->set("name", "My Tag") ->create($tags->url, $auth); alert("Created tag: {$tag->url}"); - $album = Gallery3::factory() ->set("type", "album") ->set("name", "Sample Album") @@ -34,16 +34,31 @@ $album ->save(); alert("New title: {$album->data->entity->title}"); - -$photo = Gallery3::factory() - ->set("type", "photo") - ->set("name", "Sample Photo.png") - ->set("title", "Sample Photo") - ->set_file("gallery.png") - ->create($album->url, $auth); -alert("Uploaded photo: {$photo->url}"); +for ($i = 0; $i < 2; $i++) { + $photo = Gallery3::factory() + ->set("type", "photo") + ->set("name", "Sample Photo.png") + ->set("title", "Sample Photo") + ->set_file("gallery.png") + ->create($album->url, $auth); + alert("Uploaded photo: {$photo->url}"); +} +$album->load(); alert("Album members: " . join(", ", $album->data->members) . ""); +$comment = Gallery3::factory() + ->set("item", $album->data->members[0]) + ->set("type", "comment") + ->set("text", "This is a random comment-- whee!") + ->create($comments->url, $auth); +alert("Comment: {$comment->url}"); + +alert("Reorder the album"); +$album + ->set_members(array($album->data->members[1], $album->data->members[0])) + ->set("sort_column", "weight") + ->save(); +alert("New order: " . join(", ", $album->data->members) . ""); alert("Search for the photo"); $photos = Gallery3::factory($root->url, $auth) @@ -86,7 +101,7 @@ $tag->delete(); alert("Done!"); function alert($msg) { - print "$msg
"; + print "$msg
\n"; flush(); } ?> \ No newline at end of file diff --git a/modules/basket/controllers/admin_postage_bands.php b/modules/basket/controllers/admin_postage_bands.php index 977128e3..d1b9dc97 100644 --- a/modules/basket/controllers/admin_postage_bands.php +++ b/modules/basket/controllers/admin_postage_bands.php @@ -60,9 +60,9 @@ class Admin_Postage_Bands_Controller extends Controller $postage_band->save(); message::success(t("Created postage band %postage_name", array( "postage_name" => html::clean($postage_band->name)))); - print json_encode(array("result" => "success")); + json::reply(array("result" => "success")); } else { - print json_encode(array("result" => "error", "form" => (string)$form)); + json::reply(array("result" => "error", "html" => (string)$form)); } } @@ -91,13 +91,13 @@ class Admin_Postage_Bands_Controller extends Controller $name = $postage->name; $postage->delete(); } else { - print json_encode(array("result" => "error", "form" => (string)$form)); + json::reply(array("result" => "error", "html" => (string)$form)); } $message = t("Deleted user %postage_band", array("postage_band" => html::clean($name))); log::success("user", $message); message::success($message); - print json_encode(array("result" => "success")); + json::reply(array("result" => "success")); } public function edit_postage_band($id) { @@ -127,9 +127,9 @@ class Admin_Postage_Bands_Controller extends Controller $postage->save(); message::success(t("Changed postage band %postage_name", array("postage_name" => html::clean($postage->name)))); - print json_encode(array("result" => "success")); + json::reply(array("result" => "success")); } else { - print json_encode(array("result" => "error", "form" => (string)$form)); + json::reply(array("result" => "error", "html" => (string)$form)); } } diff --git a/modules/basket/controllers/admin_product_lines.php b/modules/basket/controllers/admin_product_lines.php index fd11928e..bc01c19b 100644 --- a/modules/basket/controllers/admin_product_lines.php +++ b/modules/basket/controllers/admin_product_lines.php @@ -60,9 +60,9 @@ class Admin_Product_Lines_Controller extends Controller $product->save(); message::success(t("Created product %product_name", array( "product_name" => html::clean($product->name)))); - print json_encode(array("result" => "success")); + json::reply(array("result" => "success")); } else { - print json_encode(array("result" => "error", "form" => (string)$form)); + json::reply(array("result" => "error", "html" => (string)$form)); } } @@ -91,14 +91,13 @@ class Admin_Product_Lines_Controller extends Controller $name = $product->name; $product->delete(); } else { - print json_encode(array("result" => "error", - "form" => $form->__toString())); + json::reply(array("result" => "error", "html" => (string)$form)); } $message = t("Deleted user %product_name", array("product_name" => html::clean($name))); log::success("user", $message); message::success($message); - print json_encode(array("result" => "success")); + json::reply(array("result" => "success")); } public function edit_product($id) { @@ -129,9 +128,9 @@ class Admin_Product_Lines_Controller extends Controller $product->save(); message::success(t("Changed product %product_name", array("product_name" => html::clean($product->name)))); - print json_encode(array("result" => "success")); + json::reply(array("result" => "success")); } else { - print json_encode(array("result" => "error", "form" => (string)$form)); + json::reply(array("result" => "error", "html" => (string)$form)); } } diff --git a/modules/basket/controllers/basket.php b/modules/basket/controllers/basket.php index 1620fcdc..612708c4 100644 --- a/modules/basket/controllers/basket.php +++ b/modules/basket/controllers/basket.php @@ -189,7 +189,7 @@ Items Ordered: $form->add_to_basket->product->value, $form->add_to_basket->quantity->value); - print json_encode(array("result" => "success")); + json::reply(array("result" => "success")); } else { diff --git a/modules/calendarview/controllers/calendarview.php b/modules/calendarview/controllers/calendarview.php index d975d040..d5d23943 100644 --- a/modules/calendarview/controllers/calendarview.php +++ b/modules/calendarview/controllers/calendarview.php @@ -265,7 +265,6 @@ class CalendarView_Controller extends Controller { $str_year_id = Input::instance()->post("cal_year"); // redirect to the currect page. - url::redirect(url::site("calendarview/calendar/" . $str_year_id . "/" . $str_user_id)); - + url::redirect(url::site("calendarview/calendar/" . $str_year_id . "/" . $str_user_id, request::protocol())); } } \ No newline at end of file diff --git a/modules/calendarview/css/calendarview_calendar.css b/modules/calendarview/css/calendarview_calendar.css index e6d010e2..53807042 100644 --- a/modules/calendarview/css/calendarview_calendar.css +++ b/modules/calendarview/css/calendarview_calendar.css @@ -37,7 +37,6 @@ table.calendar caption { table.calendar th, table.calendar td { padding: 0.2em; - background: #ffffff; border: 0px; } diff --git a/modules/calendarview/helpers/calendarview_block.php b/modules/calendarview/helpers/calendarview_block.php index 46a605d8..1037ecaa 100644 --- a/modules/calendarview/helpers/calendarview_block.php +++ b/modules/calendarview/helpers/calendarview_block.php @@ -38,14 +38,32 @@ class calendarview_block_Core { $display_date = $item->created; } + // Make sure there are photo's to display. + $day_count = ORM::factory("item") + ->viewable() + ->where("type", "!=", "album") + ->where("captured", ">=", mktime(0, 0, 0, date("n", $display_date), date("j", $display_date), date("Y", $display_date))) + ->where("captured", "<", mktime(0, 0, 0, date("n", $display_date), date("j", $display_date)+1, date("Y", $display_date))) + ->find_all() + ->count(); + $month_count = ORM::factory("item") + ->viewable() + ->where("type", "!=", "album") + ->where("captured", ">=", mktime(0, 0, 0, date("n", $display_date), 1, date("Y", $display_date))) + ->where("captured", "<", mktime(0, 0, 0, date("n", $display_date)+1, 1, date("Y", $display_date))) + ->find_all() + ->count(); + switch ($block_id) { case "calendarview_photo": - if ($display_date != "") { + if ( ($display_date != "") && (($day_count > 0) || ($month_count > 0)) ) { $block = new Block(); $block->css_id = "g-calendarview-sidebar"; $block->title = t("Calendar"); $block->content = new View("calendarview_sidebar.html"); $block->content->date = $display_date; + $block->content->day_count = $day_count; + $block->content->month_count = $month_count; } break; } diff --git a/modules/calendarview/views/calendarview_sidebar.html.php b/modules/calendarview/views/calendarview_sidebar.html.php index c5a8b3f5..b4f1f6fe 100644 --- a/modules/calendarview/views/calendarview_sidebar.html.php +++ b/modules/calendarview/views/calendarview_sidebar.html.php @@ -1,5 +1,9 @@ \ No newline at end of file diff --git a/themes/okat_dark/controllers/three_nids.php b/modules/database_info/helpers/database_info_block.php similarity index 65% rename from themes/okat_dark/controllers/three_nids.php rename to modules/database_info/helpers/database_info_block.php index 042f9b3d..3607b19d 100644 --- a/themes/okat_dark/controllers/three_nids.php +++ b/modules/database_info/helpers/database_info_block.php @@ -17,20 +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 Three_Nids_Controller extends Controller { - public function show_comments($id) { - $item = ORM::factory("item", $id); - access::required("view", $item); +class database_info_block_Core { + static function get_admin_list() { + return array("database_info" => t("Database info")); + } - $comments = ORM::factory("comment") - ->where("item_id", "=", $item->id) - ->where("state", "=", "published") - ->order_by("created", "ASC") - ->find_all(); - - $v = new Theme_View("comments.html", "other", "comment-fragment"); - $v->comments = $comments; - $v->item = $item; - print $v; + static function get($block_id) { + $block = new Block(); + switch ($block_id) { + case "database_info": + $block->css_id = "g-database-info"; + $block->title = t("Database information"); + $block->content = new View("admin_block_db.html"); + break; + } + return $block; } } diff --git a/modules/database_info/module.info b/modules/database_info/module.info new file mode 100644 index 00000000..cdf8479a --- /dev/null +++ b/modules/database_info/module.info @@ -0,0 +1,3 @@ +name = "Database Info" +description = "View information about your Gallery 3 database on the admin dashboard." +version = 1 diff --git a/modules/database_info/views/admin_block_db.html.php b/modules/database_info/views/admin_block_db.html.php new file mode 100644 index 00000000..cf13d535 --- /dev/null +++ b/modules/database_info/views/admin_block_db.html.php @@ -0,0 +1,18 @@ + +query("SHOW TABLE STATUS"); + $database_size = 0; + foreach($tables as $table) { + $database_size += ($table->Data_length + $table->Index_length); + } + $database_size = $database_size / 1024 / 1024; +?> + diff --git a/modules/developer/controllers/admin_developer.php b/modules/developer/controllers/admin_developer.php index c7061320..a7d334bd 100644 --- a/modules/developer/controllers/admin_developer.php +++ b/modules/developer/controllers/admin_developer.php @@ -68,16 +68,15 @@ class Admin_Developer_Controller extends Admin_Controller { $task_context = array("step" => 0, "success_msg" => $success_msg, "error_msg" => $error_msg); $task = task::create($task_def, array_merge($task_context, $post->as_array())); - print json_encode(array("result" => "started", - "max_iterations" => 15, - "url" => url::site("admin/developer/run_task/{$task->id}?csrf=" . - access::csrf_token()), - "task" => $task->as_array())); + json::reply(array("result" => "started", + "max_iterations" => 15, + "url" => url::site("admin/developer/run_task/{$task->id}?csrf=" . + access::csrf_token()), + "task" => $task->as_array())); } else { $v = $this->_get_module_create_content(arr::overwrite($form, $post->as_array()), arr::overwrite($errors, $post->errors())); - print json_encode(array("result" => "error", - "form" => $v->__toString())); + json::reply(array("result" => "error", "html" => (string)$v)); } } @@ -119,16 +118,15 @@ class Admin_Developer_Controller extends Admin_Controller { "comments" => $post->comments, "tags" => $post->tags)); batch::start(); - print json_encode(array("result" => "started", - "max_iterations" => $total + 5, - "url" => url::site("admin/developer/run_task/{$task->id}?csrf=" . - access::csrf_token()), - "task" => $task->as_array())); + json::reply(array("result" => "started", + "max_iterations" => $total + 5, + "url" => url::site("admin/developer/run_task/{$task->id}?csrf=" . + access::csrf_token()), + "task" => $task->as_array())); } else { $v = $this->_get_test_data_view(arr::overwrite($form, $post->as_array()), - arr::overwrite($errors, $post->errors())); - print json_encode(array("result" => "error", - "form" => $v->__toString())); + arr::overwrite($errors, $post->errors())); + json::reply(array("result" => "error", "html" => (string)$v)); } } @@ -152,12 +150,10 @@ class Admin_Developer_Controller extends Admin_Controller { message::success(empty($error_msg) ? $context["error_msg"] : $error_msg); break; } - print json_encode(array("result" => "success", - "task" => $task->as_array())); + json::reply(array("result" => "success", "task" => $task->as_array())); } else { - print json_encode(array("result" => "in_progress", - "task" => $task->as_array())); + json::reply(array("result" => "in_progress", "task" => $task->as_array())); } } diff --git a/modules/developer/helpers/developer_task.php b/modules/developer/helpers/developer_task.php index 0110127e..01abd04f 100644 --- a/modules/developer/helpers/developer_task.php +++ b/modules/developer/helpers/developer_task.php @@ -25,7 +25,6 @@ class developer_task_Core { static function create_module($task) { $context = unserialize($task->context); - Kohana_Log::add("error", "task context:\n" . Kohana::debug($context)); if (empty($context["module"])) { $context["class_name"] = strtr($context["name"], " ", "_"); diff --git a/modules/developer/views/controller.txt.php b/modules/developer/views/controller.txt.php index cffefe4d..b73ae815 100644 --- a/modules/developer/views/controller.txt.php +++ b/modules/developer/views/controller.txt.php @@ -32,15 +32,12 @@ class _Controller extends Controller { message::success(t(" Processing Successfully")); - print json_encode( - array("result" => "success")); + json::reply(array("result" => "success")); } else { - print json_encode( - array("result" => "error", - "form" => $form->__toString())); + json::reply(array("result" => "error", "html" => (string)$form)); } } - + private function _get_form() { $form = new Forge("/handler", "", "post", array("id" => "g--form")); @@ -50,4 +47,4 @@ class _Controller extends Controller { return $form; } -} \ No newline at end of file +} diff --git a/modules/downloadalbum/controllers/downloadalbum.php b/modules/downloadalbum/controllers/downloadalbum.php new file mode 100644 index 00000000..c2f939f7 --- /dev/null +++ b/modules/downloadalbum/controllers/downloadalbum.php @@ -0,0 +1,272 @@ +init($id); + $files = $this->getFilesList($album); + + // Calculate ZIP size (look behind for details) + $zipsize = 22; + foreach($files as $f) { + $zipsize += 76 + 2*strlen($f) + filesize($f); + } + + // Send headers + $this->prepareOutput(); + $this->sendHeaders($album->name.'.zip', $zipsize); + + // Generate and send ZIP file + // http://www.pkware.com/documents/casestudies/APPNOTE.TXT (v6.3.2) + $lfh_offset = 0; + $cds = ''; + $cds_offset = 0; + foreach($files as $f) { + $f_namelen = strlen($f); + $f_size = filesize($f); + $f_mtime = $this->unix2dostime(filemtime($f)); + $f_crc32 = $this->fixBug45028(hexdec(hash_file('crc32b', $f, false))); + + // Local file header + echo pack('VvvvVVVVvva' . $f_namelen, + 0x04034b50, // local file header signature (4 bytes) + 0x0a, // version needed to extract (2 bytes) => 1.0 + 0x0800, // general purpose bit flag (2 bytes) => UTF-8 + 0x00, // compression method (2 bytes) => store + $f_mtime, // last mod file time and date (4 bytes) + $f_crc32, // crc-32 (4 bytes) + $f_size, // compressed size (4 bytes) + $f_size, // uncompressed size (4 bytes) + $f_namelen, // file name length (2 bytes) + 0, // extra field length (2 bytes) + + $f // file name (variable size) + // extra field (variable size) => n/a + ); + + // File data + readfile($f); + + // Data descriptor (n/a) + + // Central directory structure: File header + $cds .= pack('VvvvvVVVVvvvvvVVa' . $f_namelen, + 0x02014b50, // central file header signature (4 bytes) + 0x031e, // version made by (2 bytes) => v3 / Unix + 0x0a, // version needed to extract (2 bytes) => 1.0 + 0x0800, // general purpose bit flag (2 bytes) => UTF-8 + 0x00, // compression method (2 bytes) => store + $f_mtime, // last mod file time and date (4 bytes) + $f_crc32, // crc-32 (4 bytes) + $f_size, // compressed size (4 bytes) + $f_size, // uncompressed size (4 bytes) + $f_namelen, // file name length (2 bytes) + 0, // extra field length (2 bytes) + 0, // file comment length (2 bytes) + 0, // disk number start (2 bytes) + 0, // internal file attributes (2 bytes) + 0x81b40000, // external file attributes (4 bytes) => chmod 664 + $lfh_offset, // relative offset of local header (4 bytes) + + $f // file name (variable size) + // extra field (variable size) => n/a + // file comment (variable size) => n/a + ); + + // Update local file header/central directory structure offset + $cds_offset = $lfh_offset += 30 + $f_namelen + $f_size; + } + + // Archive decryption header (n/a) + // Archive extra data record (n/a) + + // Central directory structure: Digital signature (n/a) + echo $cds; // send Central directory structure + + // Zip64 end of central directory record (n/a) + // Zip64 end of central directory locator (n/a) + + // End of central directory record + $numfile = count($files); + $cds_len = strlen($cds); + echo pack('VvvvvVVv', + 0x06054b50, // end of central dir signature (4 bytes) + 0, // number of this disk (2 bytes) + 0, // number of the disk with the start of + // the central directory (2 bytes) + $numfile, // total number of entries in the + // central directory on this disk (2 bytes) + $numfile, // total number of entries in the + // central directory (2 bytes) + $cds_len, // size of the central directory (4 bytes) + $cds_offset, // offset of start of central directory + // with respect to the + // starting disk number (4 bytes) + 0 // .ZIP file comment length (2 bytes) + // .ZIP file comment (variable size) + ); + } + + + /** + * Init + */ + private function init($id) { + $item = ORM::factory("item", $id); + + // Only send an album + if (!$item->is_album()) { + // @todo: throw an exception? + Kohana::log('error', 'item is not an album: '.$item->relative_path()); + exit; + } + + // Must have view_full to download the originals files + access::required("view_full", $item); + + return $item; + } + + /** + * Return the files that must be included in the archive. + */ + private function getFilesList($album) { + $files = array(); + + // Go to the parent of album so the ZIP will not contains all the + // server hierarchy + if (!chdir($album->file_path().'/../')) { + // @todo: throw an exception? + Kohana::log('error', 'unable to chdir('.$item->file_path().'/../)'); + exit; + } + $cwd = getcwd(); + + $items = $album->viewable() + ->descendants(null, null, array(array("type", "<>", "album"))); + foreach($items as $i) { + if (!access::can('view_full', $i)) { + continue; + } + + $relative_path = str_replace($cwd.'/', '', realpath($i->file_path())); + if (!is_readable($relative_path)) { + continue; + } + + $files[] = $relative_path; + } + + if (count($files) === 0) { + // @todo: throw an exception? + Kohana::log('error', 'no zippable files in ['.$album->relative_path().']'); + exit; + } + + return $files; + } + + + /** + * See system/helpers/download.php + */ + private function prepareOutput() { + // Close output buffers + Kohana::close_buffers(FALSE); + // Clear any output + Event::add('system.display', create_function('', 'Kohana::$output = "";')); + } + + /** + * See system/helpers/download.php + */ + private function sendHeaders($filename, $filesize = null) { + if (!is_null($filesize)) { + header('Content-Length: '.$filesize); + } + + // Retrieve MIME type by extension + $mime = Kohana::config('mimes.'.strtolower(substr(strrchr($filename, '.'), 1))); + $mime = empty($mime) ? 'application/octet-stream' : $mime[0]; + header("Content-Type: $mime"); + header('Content-Transfer-Encoding: binary'); + + // Send headers necessary to invoke a "Save As" dialog + header('Content-Disposition: attachment; filename="'.$filename.'"'); + + // Prevent caching + header('Expires: Thu, 01 Jan 1970 00:00:00 GMT'); + + $pragma = 'no-cache'; + $cachecontrol = 'no-cache, max-age=0'; + + // request::user_agent('browser') seems bugged + if (request::user_agent('browser') === 'Internet Explorer' + || stripos(request::user_agent(), 'msie') !== false + || stripos(request::user_agent(), 'internet explorer') !== false) + { + if (request::protocol() === 'https') { + // See http://support.microsoft.com/kb/323308/en-us + $pragma = 'cache'; + $cachecontrol = 'private'; + + } else if (request::user_agent('version') <= '6.0') { + $pragma = ''; + $cachecontrol = 'must-revalidate, post-check=0, pre-check=0'; + } + } + + header('Pragma: '.$pragma); + header('Cache-Control: '.$cachecontrol); + } + + /** + * @return integer DOS date and time + * @param integer _timestamp Unix timestamp + * @desc returns DOS date and time of the timestamp + */ + private function unix2dostime($timestamp) + { + $timebit = getdate($timestamp); + + if ($timebit['year'] < 1980) { + return (1 << 21 | 1 << 16); + } + + $timebit['year'] -= 1980; + + return ($timebit['year'] << 25 | $timebit['mon'] << 21 | + $timebit['mday'] << 16 | $timebit['hours'] << 11 | + $timebit['minutes'] << 5 | $timebit['seconds'] >> 1); + } + + /** + * See http://bugs.php.net/bug.php?id=45028 + */ + private function fixBug45028($hash) { + return (version_compare(PHP_VERSION, '5.2.7', '<')) + ? (($hash & 0x000000ff) << 24) + (($hash & 0x0000ff00) << 8) + + (($hash & 0x00ff0000) >> 8) + (($hash & 0xff000000) >> 24) + : $hash; + } +} diff --git a/modules/downloadalbum/css/downloadalbum_menu.css b/modules/downloadalbum/css/downloadalbum_menu.css new file mode 100644 index 00000000..e3c4c67e --- /dev/null +++ b/modules/downloadalbum/css/downloadalbum_menu.css @@ -0,0 +1,3 @@ +#g-view-menu #g-download-album-link { + background-image: url('../images/ico-view-downloadalbum.png'); +} diff --git a/modules/downloadalbum/helpers/downloadalbum_event.php b/modules/downloadalbum/helpers/downloadalbum_event.php new file mode 100644 index 00000000..e2fe4420 --- /dev/null +++ b/modules/downloadalbum/helpers/downloadalbum_event.php @@ -0,0 +1,32 @@ +item)) { + $downloadLink = url::site("downloadalbum/zip/{$theme->item->id}"); + $menu + ->append(Menu::factory("link") + ->id("downloadalbum") + ->label(t("Download Album")) + ->url($downloadLink) + ->css_id("g-download-album-link")); + } + } +} diff --git a/modules/downloadalbum/helpers/downloadalbum_theme.php b/modules/downloadalbum/helpers/downloadalbum_theme.php new file mode 100644 index 00000000..2fd23552 --- /dev/null +++ b/modules/downloadalbum/helpers/downloadalbum_theme.php @@ -0,0 +1,26 @@ +item && access::can("view_full", $theme->item)) { + $theme->css("downloadalbum_menu.css"); + } + } +} diff --git a/modules/downloadalbum/images/ico-view-downloadalbum.png b/modules/downloadalbum/images/ico-view-downloadalbum.png new file mode 100644 index 00000000..ce7804d2 Binary files /dev/null and b/modules/downloadalbum/images/ico-view-downloadalbum.png differ diff --git a/modules/downloadalbum/module.info b/modules/downloadalbum/module.info new file mode 100644 index 00000000..177ad4a8 --- /dev/null +++ b/modules/downloadalbum/module.info @@ -0,0 +1,3 @@ +name = "DownloadAlbum" +description = "Displays a link to download a ZIP archive of the current album." +version = 1 diff --git a/modules/ecard/controllers/admin_ecards.php b/modules/ecard/controllers/admin_ecards.php new file mode 100644 index 00000000..b2bde957 --- /dev/null +++ b/modules/ecard/controllers/admin_ecards.php @@ -0,0 +1,63 @@ +page_title = t("eCard settings"); + $view->content = new View("admin_ecards.html"); + $view->content->form = $this->_get_admin_form(); + print $view; + } + + public function save() { + access::verify_csrf(); + $form = $this->_get_admin_form(); + if ($form->validate()) { + module::set_var("ecard", "sender", $form->ecard->sender->value); + module::set_var("ecard", "subject", $form->ecard->subject->value); + module::set_var("ecard", "message", $form->ecard->message->value); + module::set_var("ecard", "access_permissions", $form->ecard->access_permissions->value); + message::success(t("eCard settings updated")); + url::redirect("admin/ecards"); + } else { + print $form; + } + } + + private function _get_admin_form() { + $form = new Forge("admin/ecards/save", "", "post", array("id" => "g-ecards-admin-form")); + $ecard_settings = $form->group("ecard")->label(t("eCard settings")); + $ecard_settings->input("sender") + ->label(t("E-mail sender (leave blank for a user-defined address)")) + ->value(module::get_var("ecard", "sender", "")); + $ecard_settings->input("subject")->label(t("E-mail subject")) + ->value(module::get_var("ecard", "subject")); + $ecard_settings->textarea("message")->label(t("E-mail message")) + ->value(module::get_var("ecard", "message")); + $ecard_settings->dropdown("access_permissions") + ->label(t("Who can send eCards?")) + ->options(array("everybody" => t("Everybody"), + "registered_users" => t("Only registered users"))) + ->selected(module::get_var("ecard", "access_permissions")); + $ecard_settings->submit("save")->value(t("Save")); + return $form; + } +} + diff --git a/modules/ecard/controllers/ecards.php b/modules/ecard/controllers/ecards.php new file mode 100644 index 00000000..6ea77a00 --- /dev/null +++ b/modules/ecard/controllers/ecards.php @@ -0,0 +1,53 @@ +validate()) { + Kohana_Log::add("error",print_r($form,1)); + // Send the ecard here, based on the form data + json::reply(array("result" => "success")); + } else { + json::reply(array("result" => "error", "html" => (string)$form)); + } + } + + /** + * Present a form for adding a new ecard to this item or editing an existing ecard. + */ + public function form_send($item_id) { + $item = ORM::factory("item", $item_id); + access::required("view", $item); + if (!ecard::can_send_ecard()) { + access::forbidden(); + } + + print ecard::prefill_send_form(ecard::get_send_form($item)); + } +} diff --git a/modules/ecard/helpers/ecard.php b/modules/ecard/helpers/ecard.php new file mode 100644 index 00000000..0b4d63db --- /dev/null +++ b/modules/ecard/helpers/ecard.php @@ -0,0 +1,79 @@ +id}", "", "post", array("id" => "g-ecard-form")); + $group = $form->group("send_ecard")->label(t("Send eCard")); + $group->input("from_name") + ->label(t("Your name")) + ->id("g-author") + ->rules("required") + ->error_messages("required", t("You must enter a name for yourself")); + $group->input("from_email") + ->label(t("Your e-mail")) + ->id("g-email") + ->rules("required|valid_email") + ->error_messages("required", t("You must enter a valid email address")) + ->error_messages("invalid", t("You must enter a valid email address")); + $group->input("to_name") + ->label(t("Recipient's Name")) + ->id("g-recipient") + ->rules("required") + ->error_messages("required", t("You must enter a recipient's name")); + $group->input("to_email") + ->label(t("Recipient's e-mail")) + ->id("g-recip-email") + ->rules("required|valid_email") + ->error_messages("required", t("You must enter a valid email address")) + ->error_messages("invalid", t("You must enter a valid email address")); + $group->textarea("text") + ->label(t("Message")) + ->id("g-text") + ->rules("required") + ->error_messages("required", t("You must enter a message")); + $group->hidden("item_id")->value($item->id); + module::event("ecard_send_form", $form); + $group->submit("")->value(t("Send"))->class("ui-state-default ui-corner-all"); + + return $form; + } + + static function prefill_send_form($form) { + $active = identity::active_user(); + if (!$active->guest) { + $group = $form->send_ecard; + $group->inputs["from_name"]->value($active->full_name); + $group->from_email->value($active->email); + } + return $form; + } + + static function can_send_ecard() { + return !identity::active_user()->guest || + module::get_var("ecard", "access_permissions") == "everybody"; + } +} + diff --git a/modules/ecard/helpers/ecard_event.php b/modules/ecard/helpers/ecard_event.php new file mode 100644 index 00000000..b7517185 --- /dev/null +++ b/modules/ecard/helpers/ecard_event.php @@ -0,0 +1,28 @@ +get("settings_menu") + ->append(Menu::factory("link") + ->id("ecard") + ->label(t("eCard Settings")) + ->url(url::site("admin/ecards"))); + } +} diff --git a/modules/ecard/helpers/ecard_installer.php b/modules/ecard/helpers/ecard_installer.php new file mode 100644 index 00000000..2f514b09 --- /dev/null +++ b/modules/ecard/helpers/ecard_installer.php @@ -0,0 +1,29 @@ +css_id = "g-ecards"; + $block->title = t("eCards"); + $block->content = new View("ecards.html"); + return $block; + } + } +} \ No newline at end of file diff --git a/modules/ecard/module.info b/modules/ecard/module.info new file mode 100644 index 00000000..bc50f729 --- /dev/null +++ b/modules/ecard/module.info @@ -0,0 +1,3 @@ +name = "E-Card" +description = "Send a photo as a postcard" +version = 1 diff --git a/modules/ecard/views/admin_ecards.html.php b/modules/ecard/views/admin_ecards.html.php new file mode 100644 index 00000000..0dd6b926 --- /dev/null +++ b/modules/ecard/views/admin_ecards.html.php @@ -0,0 +1,7 @@ + +
+

+
+ +
+
diff --git a/modules/ecard/views/ecards.html.php b/modules/ecard/views/ecards.html.php new file mode 100644 index 00000000..e655debb --- /dev/null +++ b/modules/ecard/views/ecards.html.php @@ -0,0 +1,6 @@ + +id}") ?>" id="g-add-ecard" + class="g-button ui-corner-all ui-icon-left ui-state-default g-dialog-link"> + + + diff --git a/modules/exif_gps/controllers/admin_exif_gps.php b/modules/exif_gps/controllers/admin_exif_gps.php new file mode 100644 index 00000000..04f540e0 --- /dev/null +++ b/modules/exif_gps/controllers/admin_exif_gps.php @@ -0,0 +1,129 @@ +content = new View("admin_exif_gps.html"); + $view->content->exifgps_form = $this->_get_admin_form(); + print $view; + } + + public function saveprefs() { + // Save user preferences to the database. + + // Prevent Cross Site Request Forgery + access::verify_csrf(); + + // Make sure the user filled out the form properly. + $form = $this->_get_admin_form(); + if ($form->validate()) { + Kohana_Log::add("error",print_r($form,1)); + + // Save settings to Gallery's database. + module::set_var("exif_gps", "googlemap_api_key", $form->Global->google_api_key->value); + module::set_var("exif_gps", "googlemap_max_autozoom", $form->Global->max_auto_zoom_level->value); + module::set_var("exif_gps", "sidebar_zoom", $form->Sidebar->sidebar_default_zoom->value); + module::set_var("exif_gps", "sidebar_mapformat", $form->Sidebar->sidebar_mapformat->value); + module::set_var("exif_gps", "sidebar_maptype", $form->Sidebar->sidebar_maptype->value); + module::set_var("exif_gps", "largemap_maptype", $form->LargeMap->largemap_maptype->value); + $checkbox_album = false; + $checkbox_user = false; + for ($i = 0; $i < count($form->Global->toolbar_map_album); $i++) { + if ($form->Global->toolbar_map_album->value[$i] == "checkbox_album") { + $checkbox_album = true; + } + } + for ($i = 0; $i < count($form->Global->toolbar_map_user); $i++) { + if ($form->Global->toolbar_map_user->value[$i] == "checkbox_user") { + $checkbox_user = true; + } + } + module::set_var("exif_gps", "toolbar_map_album", $checkbox_album); + module::set_var("exif_gps", "toolbar_map_user", $checkbox_user); + + // Display a success message and redirect back to the TagsMap admin page. + message::success(t("Your settings have been saved.")); + url::redirect("admin/exif_gps"); + } + + // Else show the page with errors + $view = new Admin_View("admin.html"); + $view->content = new View("admin_exif_gps.html"); + $view->content->exifgps_form = $form; + print $view; + } + + private function _get_admin_form() { + // Make a new Form. + $form = new Forge("admin/exif_gps/saveprefs", "", "post", + array("id" => "g-exif-gps-adminForm")); + + // Create group for global settings, like the Maps API Key + $gps_global_group = $form->group("Global") + ->label(t("Global Settings")); + $gps_global_group->input("google_api_key") + ->label(t("Google Maps API Key")) + ->value(module::get_var("exif_gps", "googlemap_api_key")) + ->rules("required"); + $gps_global_group->input("max_auto_zoom_level") + ->label(t("Maximum Auto-Zoom Level:")) + ->value(module::get_var("exif_gps", "googlemap_max_autozoom")); + $checkbox_user["checkbox_user"] = array(t("Show \"Map this user\" icon?"), module::get_var("exif_gps", "toolbar_map_user")); + $checkbox_album["checkbox_album"] = array(t("Show \"Map this album\" icon?"), module::get_var("exif_gps", "toolbar_map_album")); + $gps_global_group->checklist("toolbar_map_album") + ->options($checkbox_album); + $gps_global_group->checklist("toolbar_map_user") + ->options($checkbox_user); + + // Create a group for sidebar settings + $gps_sidebar = $form->group("Sidebar") + ->label(t("Sidebar Settings")); + $gps_sidebar->input("sidebar_default_zoom") + ->label(t("Default Zoom Level")) + ->value(module::get_var("exif_gps", "sidebar_zoom")) + ->rules("required"); + $gps_sidebar->dropdown("sidebar_mapformat") + ->label(t("Map Interface")) + ->options(array(t("Static"), t("Interactive"))) + ->selected(module::get_var("exif_gps", "sidebar_mapformat")); + $gps_sidebar->dropdown("sidebar_maptype") + ->label(t("Default Map Type")) + ->options(array(t("Map"), t("Satellite"), + t("Hybrid"), t("Terrain"))) + ->selected(module::get_var("exif_gps", "sidebar_maptype")); + + // Create a group for map album/user settings + $gps_large_map_group = $form->group("LargeMap") + ->label(t("Map Album/User Settings")); + $gps_large_map_group->dropdown("largemap_maptype") + ->label(t("Default Map Type")) + ->options(array(t("Map"), t("Satellite"), + t("Hybrid"), t("Terrain"))) + ->selected(module::get_var("exif_gps", "largemap_maptype")); + + // Add a save button to the form. + $form->submit("SaveSettings")->value(t("Save")); + + // Return the newly generated form. + return $form; + } +} diff --git a/modules/exif_gps/controllers/exif_gps.php b/modules/exif_gps/controllers/exif_gps.php new file mode 100644 index 00000000..262c7938 --- /dev/null +++ b/modules/exif_gps/controllers/exif_gps.php @@ -0,0 +1,78 @@ +join("exif_coordinates", "items.id", "exif_coordinates.item_id") + ->viewable() + ->order_by("exif_coordinates.latitude", "ASC") + ->descendants(); + $curr_album = ORM::factory("item")->where("id", "=", $type_id)->find_all(); + $map_title = $curr_album[0]->name; + } elseif ($map_type == "user") { + // Generate an array of all items uploaded by the current user that + // have exif gps coordinates and order by latitude (to group items + // w/ the same coordinates together). + $items = ORM::factory("item") + ->join("exif_coordinates", "items.id", "exif_coordinates.item_id") + ->where("items.owner_id", "=", $type_id) + ->viewable() + ->order_by("exif_coordinates.latitude", "ASC") + ->find_all(); + $curr_user = ORM::factory("user")->where("id", "=", $type_id)->find_all(); + $map_title = $curr_user[0]->full_name . "'s " . t("Photos"); + } + + // Make a new page. + $template = new Theme_View("page.html", "other", "EXIFMap"); + $template->page_title = t("Gallery :: Map"); + $template->content = new View("exif_gps_map.html"); + if ($map_title == "") { + $template->content->title = t("Map"); + } else { + $template->content->title = t("Map of") . " " . $map_title; + } + + // Figure out default map type. + $int_map_type = module::get_var("exif_gps", "largemap_maptype"); + if ($int_map_type == 0) $map_type = "ROADMAP"; + if ($int_map_type == 1) $map_type = "SATELLITE"; + if ($int_map_type == 2) $map_type = "HYBRID"; + if ($int_map_type == 3) $map_type = "TERRAIN"; + $template->content->map_type = $map_type; + + // When mapping an album, generate a "return to album" link. + if (isset($curr_album)) $template->content->return_url = url::abs_site("{$curr_album[0]->type}s/{$curr_album[0]->id}"); + + // Load in module preferences. + $template->content->items = $items; + $template->content->google_map_key = module::get_var("exif_gps", "googlemap_api_key"); + + // Display the page. + print $template; + } +} diff --git a/modules/exif_gps/css/exif_gps_menu.css b/modules/exif_gps/css/exif_gps_menu.css new file mode 100644 index 00000000..3f8afa28 --- /dev/null +++ b/modules/exif_gps/css/exif_gps_menu.css @@ -0,0 +1,6 @@ +#g-view-menu #g-exif-gps-album-link { + background-image: url('../images/ico-view-exif_gps_album.png'); +} +#g-view-menu #g-exif-gps-user-link { + background-image: url('../images/ico-view-exif_gps_user.png'); +} diff --git a/modules/exif_gps/helpers/exif_gps.php b/modules/exif_gps/helpers/exif_gps.php index 1cab6558..d3440424 100644 --- a/modules/exif_gps/helpers/exif_gps.php +++ b/modules/exif_gps/helpers/exif_gps.php @@ -17,12 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ - -/** - * This is the API for handling exif data. - */ class exif_gps_Core { - protected static $exif_keys; static function extract($item) { @@ -52,10 +47,10 @@ class exif_gps_Core { $record->latitude = str_replace(",", ".", $keys["Latitude"]); $record->longitude = str_replace(",", ".", $keys["Longitude"]); // Represent N/S/E/W as postive and negative numbers - if ($keys["Latitude Reference"] == "S") { + if (substr(strtoupper($keys["Latitude Reference"]), 0, 1) == "S") { $record->latitude = "-" . $record->latitude; } - if ($keys["Longitude Reference"] == "W") { + if (substr(strtoupper($keys["Longitude Reference"]), 0, 1) == "W") { $record->longitude = "-" . $record->longitude; } $record->save(); @@ -74,4 +69,4 @@ class exif_gps_Core { } return self::$exif_keys; } -} \ No newline at end of file +} diff --git a/modules/exif_gps/helpers/exif_gps_block.php b/modules/exif_gps/helpers/exif_gps_block.php index 77e3d5e5..78d29609 100644 --- a/modules/exif_gps/helpers/exif_gps_block.php +++ b/modules/exif_gps/helpers/exif_gps_block.php @@ -19,48 +19,130 @@ */ class exif_gps_block_Core { static function get_site_list() { - return array("exif_gps_map" => t("EXIF GPS Map")); + return array("exif_gps_location" => t("EXIF GPS Location"), + "exif_gps_maps" => t("EXIF GPS Maps")); } static function get($block_id, $theme) { $block = ""; - // Make sure the current page belongs to an item. - if (!$theme->item()) { - return; - } - switch ($block_id) { - case "exif_gps_map": - // Check and see if the item has exif coordinates associated with it. - $record = ORM::factory("exif_coordinate")->where("item_id", "=", $theme->item->id)->find(); - if ($record->loaded()) { - $block = new Block(); - $block->css_id = "g-exif-gps-sidebar"; - $block->title = t("Location"); - $block->content = new View("exif_gps_sidebar.html"); - $block->content->latitude = $record->latitude; - $block->content->longitude = $record->longitude; - } elseif (module::is_active("tagsmap") && module::is_active("tag")) { - // If there are no exif coordinates, check for tagsmap coordinates instead. - $tagsItem = ORM::factory("tag") - ->join("items_tags", "tags.id", "items_tags.tag_id") - ->where("items_tags.item_id", "=", $theme->item->id) - ->find_all(); - if (count($tagsItem) > 0) { - foreach ($tagsItem as $oneTag) { - $tagsGPS = ORM::factory("tags_gps")->where("tag_id", "=", $oneTag->id)->find(); - if ($tagsGPS->loaded()) { - $block = new Block(); - $block->css_id = "g-exif-gps-sidebar"; - $block->title = t("Location"); - $block->content = new View("exif_gps_sidebar.html"); - $block->content->latitude = $tagsGPS->latitude; - $block->content->longitude = $tagsGPS->longitude; - break; + case "exif_gps_maps": + // Display links to a map of the current album and + // a map of the current user. + if ($theme->item()) { + $album_id = ""; + $item = $theme->item; + if ($item->is_album()) { + $album_id = $item->id; + } else { + $album_id = $item->parent_id; + } + $curr_user = ORM::factory("user")->where("id", "=", $item->owner_id)->find_all(); + $user_name = $curr_user[0]->full_name; + + // Make sure there are actually map-able items to display. + $album_items_count = ORM::factory("item", $album_id) + ->join("exif_coordinates", "items.id", "exif_coordinates.item_id") + ->viewable() + ->order_by("exif_coordinates.latitude", "ASC") + ->descendants_count(); + $user_items_count = ORM::factory("item") + ->join("exif_coordinates", "items.id", "exif_coordinates.item_id") + ->where("items.owner_id", "=", $item->owner_id) + ->viewable() + ->order_by("exif_coordinates.latitude", "ASC") + ->count_all(); + + if (($album_items_count > 0) || ($user_items_count > 0)) { + $block = new Block(); + $block->css_id = "g-exif-gps-maps"; + $block->title = t("Maps"); + $block->content = new View("exif_gps_maps_sidebar.html"); + $block->content->album_id = $album_id; + $block->content->user_id = $item->owner_id; + $block->content->user_name = $user_name; + $block->content->album_items = $album_items_count; + $block->content->user_items = $user_items_count; + } + } + break; + + case "exif_gps_location": + // Look for coordinates to display. + $latitude = ""; + $longitude = ""; + if ($theme->item()) { + // Check and see if the item has exif coordinates associated with it. + $record = ORM::factory("exif_coordinate")->where("item_id", "=", $theme->item->id)->find(); + if ($record->loaded()) { + $latitude = $record->latitude; + $longitude = $record->longitude; + } elseif (module::is_active("tagsmap") && module::is_active("tag")) { + // If there are no exif coordinates, check for tagsmap coordinates instead. + $tagsItem = ORM::factory("tag") + ->join("items_tags", "tags.id", "items_tags.tag_id") + ->where("items_tags.item_id", "=", $theme->item->id) + ->find_all(); + if (count($tagsItem) > 0) { + foreach ($tagsItem as $oneTag) { + $tagsGPS = ORM::factory("tags_gps")->where("tag_id", "=", $oneTag->id)->find(); + if ($tagsGPS->loaded()) { + $latitude = $tagsGPS->latitude; + $longitude = $tagsGPS->longitude; + break; + } } } } + } elseif ( ($theme->tag()) && (module::is_active("tagsmap") && module::is_active("tag")) ) { + // If the current page belongs to a tag, check and see if the tag has GPS coordinates. + $tagsGPS = ORM::factory("tags_gps")->where("tag_id", "=", $theme->tag()->id)->find(); + if ($tagsGPS->loaded()) { + $latitude = $tagsGPS->latitude; + $longitude = $tagsGPS->longitude; + } + } + + // If coordinates were found, create the block. + if ($latitude != "" && $longitude != "") { + $block = new Block(); + $block->css_id = "g-exif-gps-location"; + $block->title = t("Location"); + if (module::get_var("exif_gps", "sidebar_mapformat") == 1) { + $block->content = new View("exif_gps_dynamic_sidebar.html"); + if (module::get_var("exif_gps", "sidebar_maptype") == 0) $block->content->sidebar_map_type = "ROADMAP"; + if (module::get_var("exif_gps", "sidebar_maptype") == 1) $block->content->sidebar_map_type = "SATELLITE"; + if (module::get_var("exif_gps", "sidebar_maptype") == 2) $block->content->sidebar_map_type = "HYBRID"; + if (module::get_var("exif_gps", "sidebar_maptype") == 3) $block->content->sidebar_map_type = "TERRAIN"; + } else { + $block->content = new View("exif_gps_static_sidebar.html"); + if (module::get_var("exif_gps", "sidebar_maptype") == 0) $block->content->sidebar_map_type = "roadmap"; + if (module::get_var("exif_gps", "sidebar_maptype") == 1) $block->content->sidebar_map_type = "satellite"; + if (module::get_var("exif_gps", "sidebar_maptype") == 2) $block->content->sidebar_map_type = "hybrid"; + if (module::get_var("exif_gps", "sidebar_maptype") == 3) $block->content->sidebar_map_type = "terrain"; + } + $block->content->latitude = $latitude; + $block->content->longitude = $longitude; + } elseif (($theme->item()) && ($theme->item->is_album() && (module::get_var("exif_gps", "sidebar_mapformat") == 1))) { + // If coordinates were NOT found, and this is an album with a dynamic map, then map the contents of the album. + $items = ORM::factory("item", $theme->item->id) + ->join("exif_coordinates", "items.id", "exif_coordinates.item_id") + ->viewable() + ->order_by("exif_coordinates.latitude", "ASC") + ->descendants(); + if (count($items) > 0) { + $block = new Block(); + $block->css_id = "g-exif-gps-location"; + $block->title = t("Location"); + $block->content = new View("exif_gps_dynamic2_sidebar.html"); + if (module::get_var("exif_gps", "sidebar_maptype") == 0) $block->content->sidebar_map_type = "ROADMAP"; + if (module::get_var("exif_gps", "sidebar_maptype") == 1) $block->content->sidebar_map_type = "SATELLITE"; + if (module::get_var("exif_gps", "sidebar_maptype") == 2) $block->content->sidebar_map_type = "HYBRID"; + if (module::get_var("exif_gps", "sidebar_maptype") == 3) $block->content->sidebar_map_type = "TERRAIN"; + $block->content->items = $items; + $block->content->google_map_key = module::get_var("exif_gps", "googlemap_api_key"); + } } break; } diff --git a/modules/exif_gps/helpers/exif_gps_event.php b/modules/exif_gps/helpers/exif_gps_event.php index e19f2a17..7e1a6396 100644 --- a/modules/exif_gps/helpers/exif_gps_event.php +++ b/modules/exif_gps/helpers/exif_gps_event.php @@ -56,14 +56,15 @@ class exif_gps_event_Core { static function item_edit_form($item, $form) { // Allow users to set / edit the GPS coordinates associated with the current item. $record = ORM::factory("exif_coordinate")->where("item_id", "=", $item->id)->find(); + $gpsdata = $form->edit_item->group("gps_data")->label("GPS Data"); if ($record->loaded()) { - $form->edit_item->input("latitude")->label(t("Latitude")) + $gpsdata->input("latitude")->label(t("Latitude")) ->value($record->latitude); - $form->edit_item->input("longitude")->label(t("Longitude")) + $gpsdata->input("longitude")->label(t("Longitude")) ->value($record->longitude); } else { - $form->edit_item->input("latitude")->label(t("Latitude")); - $form->edit_item->input("longitude")->label(t("Longitude")); + $gpsdata->input("latitude")->label(t("Latitude")); + $gpsdata->input("longitude")->label(t("Longitude")); } } @@ -72,7 +73,7 @@ class exif_gps_event_Core { // Require a set of coordinates (both latitude and longitude). // If one or both fields are blank, completely delete any coordinates associated with this item. - if (($form->edit_item->latitude->value == "") || ($form->edit_item->longitude->value == "")) { + if (($form->edit_item->gps_data->latitude->value == "") || ($form->edit_item->gps_data->longitude->value == "")) { db::build() ->delete("exif_coordinates") ->where("item_id", "=", $item->id) @@ -82,9 +83,138 @@ class exif_gps_event_Core { if (!$record->loaded()) { $record->item_id = $item->id; } - $record->latitude = $form->edit_item->latitude->value; - $record->longitude = $form->edit_item->longitude->value; + $record->latitude = $form->edit_item->gps_data->latitude->value; + $record->longitude = $form->edit_item->gps_data->longitude->value; $record->save(); } } + + static function admin_menu($menu, $theme) { + // Add a link to the EXIF_GPS admin page to the Settings menu. + $menu->get("settings_menu") + ->append(Menu::factory("link") + ->id("exif_gps") + ->label(t("EXIF_GPS Settings")) + ->url(url::site("admin/exif_gps"))); + } + + static function photo_menu($menu, $theme) { + $album_id = ""; + $item = $theme->item; + if ($item->is_album()) { + $album_id = $item->id; + } else { + $album_id = $item->parent_id; + } + $curr_user = ORM::factory("user")->where("id", "=", $item->owner_id)->find_all(); + $user_name = $curr_user[0]->full_name; + + // Make sure there are actually map-able items to display. + $album_items_count = ORM::factory("item", $album_id) + ->join("exif_coordinates", "items.id", "exif_coordinates.item_id") + ->viewable() + ->order_by("exif_coordinates.latitude", "ASC") + ->descendants_count(); + $user_items_count = ORM::factory("item") + ->join("exif_coordinates", "items.id", "exif_coordinates.item_id") + ->where("items.owner_id", "=", $item->owner_id) + ->viewable() + ->order_by("exif_coordinates.latitude", "ASC") + ->count_all(); + + if (($album_items_count > 0) && (module::get_var("exif_gps", "toolbar_map_album") == true)) { + $menu->append(Menu::factory("link") + ->id("exif_gps_album") + ->label(t("Map this album")) + ->url(url::site("exif_gps/map/album/" . $album_id)) + ->css_id("g-exif-gps-album-link")); + } + if (($user_items_count > 0) && (module::get_var("exif_gps", "toolbar_map_user") == true)) { + $menu->append(Menu::factory("link") + ->id("exif_gps_user") + ->label(t("Map ") . $user_name . t("'s photos")) + ->url(url::site("exif_gps/map/user/" . $item->owner_id)) + ->css_id("g-exif-gps-user-link")); + } + } + + static function movie_menu($menu, $theme) { + $album_id = ""; + $item = $theme->item; + if ($item->is_album()) { + $album_id = $item->id; + } else { + $album_id = $item->parent_id; + } + $curr_user = ORM::factory("user")->where("id", "=", $item->owner_id)->find_all(); + $user_name = $curr_user[0]->full_name; + + // Make sure there are actually map-able items to display. + $album_items_count = ORM::factory("item", $album_id) + ->join("exif_coordinates", "items.id", "exif_coordinates.item_id") + ->viewable() + ->order_by("exif_coordinates.latitude", "ASC") + ->descendants_count(); + $user_items_count = ORM::factory("item") + ->join("exif_coordinates", "items.id", "exif_coordinates.item_id") + ->where("items.owner_id", "=", $item->owner_id) + ->viewable() + ->order_by("exif_coordinates.latitude", "ASC") + ->count_all(); + + if (($album_items_count > 0) && (module::get_var("exif_gps", "toolbar_map_album") == true)) { + $menu->append(Menu::factory("link") + ->id("exif_gps_album") + ->label(t("Map this album")) + ->url(url::site("exif_gps/map/album/" . $album_id)) + ->css_id("g-exif-gps-album-link")); + } + if (($user_items_count > 0) && (module::get_var("exif_gps", "toolbar_map_user") == true)) { + $menu->append(Menu::factory("link") + ->id("exif_gps_user") + ->label(t("Map ") . $user_name . t("'s photos")) + ->url(url::site("exif_gps/map/user/" . $item->owner_id)) + ->css_id("g-exif-gps-user-link")); + } + } + + static function album_menu($menu, $theme) { + $album_id = ""; + $item = $theme->item; + if ($item->is_album()) { + $album_id = $item->id; + } else { + $album_id = $item->parent_id; + } + $curr_user = ORM::factory("user")->where("id", "=", $item->owner_id)->find_all(); + $user_name = $curr_user[0]->full_name; + + // Make sure there are actually map-able items to display. + $album_items_count = ORM::factory("item", $album_id) + ->join("exif_coordinates", "items.id", "exif_coordinates.item_id") + ->viewable() + ->order_by("exif_coordinates.latitude", "ASC") + ->descendants_count(); + $user_items_count = ORM::factory("item") + ->join("exif_coordinates", "items.id", "exif_coordinates.item_id") + ->where("items.owner_id", "=", $item->owner_id) + ->viewable() + ->order_by("exif_coordinates.latitude", "ASC") + ->count_all(); + + if (($album_items_count > 0) && (module::get_var("exif_gps", "toolbar_map_album") == true)) { + $menu->append(Menu::factory("link") + ->id("exif_gps_album") + ->label(t("Map this album")) + ->url(url::site("exif_gps/map/album/" . $album_id)) + ->css_id("g-exif-gps-album-link")); + } + if (($user_items_count > 0) && (module::get_var("exif_gps", "toolbar_map_user") == true)) { + $menu->append(Menu::factory("link") + ->id("exif_gps_user") + ->label(t("Map ") . $user_name . t("'s photos")) + ->url(url::site("exif_gps/map/user/" . $item->owner_id)) + ->css_id("g-exif-gps-user-link")); + } + } } diff --git a/modules/exif_gps/helpers/exif_gps_installer.php b/modules/exif_gps/helpers/exif_gps_installer.php index 6377228b..4e75c546 100644 --- a/modules/exif_gps/helpers/exif_gps_installer.php +++ b/modules/exif_gps/helpers/exif_gps_installer.php @@ -30,7 +30,35 @@ class exif_gps_installer { KEY(`item_id`, `id`)) DEFAULT CHARSET=utf8;"); - module::set_version("exif_gps", 1); + // If tagsmap is installed, copy the API key over. + if (module::is_active("tagsmap")) { + module::set_var("exif_gps", "googlemap_api_key", module::get_var("tagsmap", "googlemap_api_key")); + } + + // Set some default values. + module::set_var("exif_gps", "sidebar_zoom", "14"); + module::set_var("exif_gps", "sidebar_mapformat", "1"); + module::set_var("exif_gps", "sidebar_maptype", "1"); + module::set_var("exif_gps", "largemap_maptype", "2"); + + // Set the module version number. + module::set_version("exif_gps", 2); + } + + static function upgrade($version) { + if ($version == 1) { + // If tagsmap is installed, copy the API key over. + if (module::is_active("tagsmap")) { + module::set_var("exif_gps", "googlemap_api_key", module::get_var("tagsmap", "googlemap_api_key")); + } + + // Set some default values. + module::set_var("exif_gps", "sidebar_zoom", "14"); + module::set_var("exif_gps", "sidebar_mapformat", "1"); + module::set_var("exif_gps", "sidebar_maptype", "1"); + module::set_var("exif_gps", "largemap_maptype", "2"); + module::set_version("exif_gps", 2); + } } static function deactivate() { diff --git a/modules/exif_gps/helpers/exif_gps_theme.php b/modules/exif_gps/helpers/exif_gps_theme.php new file mode 100644 index 00000000..160373a2 --- /dev/null +++ b/modules/exif_gps/helpers/exif_gps_theme.php @@ -0,0 +1,24 @@ +css("exif_gps_menu.css"); + } +} diff --git a/modules/exif_gps/images/ico-view-exif_gps_album.png b/modules/exif_gps/images/ico-view-exif_gps_album.png new file mode 100644 index 00000000..255d6496 Binary files /dev/null and b/modules/exif_gps/images/ico-view-exif_gps_album.png differ diff --git a/modules/exif_gps/images/ico-view-exif_gps_user.png b/modules/exif_gps/images/ico-view-exif_gps_user.png new file mode 100644 index 00000000..e9f72b3b Binary files /dev/null and b/modules/exif_gps/images/ico-view-exif_gps_user.png differ diff --git a/modules/exif_gps/models/exif_coordinate.php b/modules/exif_gps/models/exif_coordinate.php index 8e898f45..481da1cd 100644 --- a/modules/exif_gps/models/exif_coordinate.php +++ b/modules/exif_gps/models/exif_coordinate.php @@ -18,4 +18,4 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ class EXIF_Coordinate_Model extends ORM { -} \ No newline at end of file +} diff --git a/modules/exif_gps/module.info b/modules/exif_gps/module.info index be30a70b..05a3aae3 100644 --- a/modules/exif_gps/module.info +++ b/modules/exif_gps/module.info @@ -1,3 +1,3 @@ name = "Exif GPS Data" description = "Extract Exif GPS data from photos." -version = 1 +version = 2 diff --git a/modules/exif_gps/views/admin_exif_gps.html.php b/modules/exif_gps/views/admin_exif_gps.html.php new file mode 100644 index 00000000..dcfed2c9 --- /dev/null +++ b/modules/exif_gps/views/admin_exif_gps.html.php @@ -0,0 +1,7 @@ + +
+

+
http://code.google.com/apis/maps/signup.html.
+ +

+
diff --git a/modules/exif_gps/views/exif_gps_dynamic2_sidebar.html.php b/modules/exif_gps/views/exif_gps_dynamic2_sidebar.html.php new file mode 100644 index 00000000..24b69acb --- /dev/null +++ b/modules/exif_gps/views/exif_gps_dynamic2_sidebar.html.php @@ -0,0 +1,59 @@ + + + + + diff --git a/modules/exif_gps/views/exif_gps_dynamic_sidebar.html.php b/modules/exif_gps/views/exif_gps_dynamic_sidebar.html.php new file mode 100644 index 00000000..d5b497dc --- /dev/null +++ b/modules/exif_gps/views/exif_gps_dynamic_sidebar.html.php @@ -0,0 +1,22 @@ + + + + diff --git a/modules/exif_gps/views/exif_gps_map.html.php b/modules/exif_gps/views/exif_gps_map.html.php new file mode 100644 index 00000000..6c8a59ee --- /dev/null +++ b/modules/exif_gps/views/exif_gps_map.html.php @@ -0,0 +1,96 @@ + + + + +
+
+ dynamic_top() ?> +
+

+
+
+
+ +
+ +dynamic_bottom() ?> diff --git a/modules/exif_gps/views/exif_gps_maps_sidebar.html.php b/modules/exif_gps/views/exif_gps_maps_sidebar.html.php new file mode 100644 index 00000000..495554ac --- /dev/null +++ b/modules/exif_gps/views/exif_gps_maps_sidebar.html.php @@ -0,0 +1,9 @@ + + diff --git a/modules/exif_gps/views/exif_gps_sidebar.html.php b/modules/exif_gps/views/exif_gps_sidebar.html.php deleted file mode 100644 index 93aa3594..00000000 --- a/modules/exif_gps/views/exif_gps_sidebar.html.php +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/modules/exif_gps/views/exif_gps_static_sidebar.html.php b/modules/exif_gps/views/exif_gps_static_sidebar.html.php new file mode 100644 index 00000000..11d80c74 --- /dev/null +++ b/modules/exif_gps/views/exif_gps_static_sidebar.html.php @@ -0,0 +1,2 @@ + +&size=205x214&maptype=&markers=color:red|color:red|,&sensor=false"> diff --git a/modules/favourites/controllers/admin_favourites_configure.php b/modules/favourites/controllers/admin_favourites_configure.php new file mode 100644 index 00000000..ad6af6f6 --- /dev/null +++ b/modules/favourites/controllers/admin_favourites_configure.php @@ -0,0 +1,50 @@ +validate()) { + + favourites_configuration::extractForm($form); + message::success(t("Favourites Module Configured!")); + } + } + else + { + favourites_configuration::populateForm($form); + } + + $view = new Admin_View("admin.html"); + $view->content = new View("admin_favourites_configure.html"); + + $view->content->form = $form; + + print $view; + } +} diff --git a/modules/favourites/controllers/favourites.php b/modules/favourites/controllers/favourites.php new file mode 100644 index 00000000..d7989682 --- /dev/null +++ b/modules/favourites/controllers/favourites.php @@ -0,0 +1,206 @@ +name =="guest"){ + //login required. + url::redirect("login/html"); + return; + } + + $album = Favourites::getOrCreate()->get_as_album(); + + $page_size = module::get_var("gallery", "page_size", 9); + $input = Input::instance(); + $show = $input->get("show"); + + if ($show) { + $child = ORM::factory("item", $show); + $index = $album->get_position($child); + if ($index) { + $page = ceil($index / $page_size); + if ($page == 1) { + //url::redirect("favourites"); + } else { + //url::redirect("favourites?page=$page"); + } + } + } + + + $page = $input->get("page", "1"); + $children_count = $album->viewable()->children_count(); + $offset = ($page - 1) * $page_size; + $max_pages = max(ceil($children_count / $page_size), 1); + + + // Make sure that the page references a valid offset + if ($page < 1) { + //url::redirect($album->abs_url()); + } else if ($page > $max_pages) { + //url::redirect($album->abs_url("page=$max_pages")); + } + + + + $template = new Theme_View("page.html", "collection", "favourites"); + $template->set_global("page", $page); + $template->set_global("page_title", null); + $template->set_global("max_pages", $max_pages); + $template->set_global("page_size", $page_size); + $template->set_global("children", $album->viewable()->children($page_size, $offset)); + $template->set_global("children_count", $children_count); + $template->content = new View("dynamic.html"); + + print $template; + } + + public function view(){ + if (favourites_configuration::isUsersOnly() && identity::active_user()->name =="guest"){ + //login required. + Session::instance()->set("continue_url", url::current(true)); + $template = new Theme_View("page.html", "collection", "album"); + $template->content = new View("login_required.html"); + $template->content->login_form = new View("login_ajax.html"); + $template->content->login_form->form = auth::get_login_form("login/auth_html"); + print $template; + return; + } + + // extract details from url + $favourites = Favourites::getOrCreate(); + $favourites->clear(); + $array = func_get_args(); + foreach($array as $i=>$item){ + $favourites->toggle($item); + } + url::redirect("favourites"); + } + + private function getSaveForm(){ + + $form = new Forge("favourites/save_favourites", "", "post", array("id" => "gAddToBasketForm")); + $group = $form->group("save")->label(t("Save Favourites")); + $group->hidden("id"); + $group->input("fullname")->label(t("Name"))->id("gname") + ->error_messages("required", t("You must provide your name")) + ->error_messages("not_logged_in", t("You must be logged in to send favourites.")) + ->rules("required"); + $group->input("email")->label(t("Email Address"))->id("gemail") + ->error_messages("required", t("You must provide an email address")) + ->error_messages("valid_email", t("You must provide a valid email address")) + ->rules("valid_email") + ->rules("required"); + $group->textarea("details")->label(t("Comments"))->id("gdetails"); + + $group->submit("")->value(t("save")); + return $form; + } + public function save(){ + $view = new View("save_dialog.html"); + + // get the basket to add to + $form = self::getSaveForm(); + $view->form = $form; + + print $view; + + } + + public function save_favourites($id){ + + access::verify_csrf(); + + $form = self::getSaveForm(); + $valid = $form->validate(); + $name = $form->save->fullname->value; + $email_address = $form->save->email->value; + $comments = $form->save->details->value; + + + if (!isset($email_address ) || strlen($email_address) == 0) { + $valid=false; + $form->save->email->add_error("required", 1); + } + + if (!isset($name ) || strlen($name) == 0) { + $valid=false; + $form->save->fullname->add_error("required", 1); + } + + if (favourites_configuration::isUsersOnly() && identity::active_user()->name =="guest"){ + $valid=false; + $form->save->fullname->add_error("not_logged_in", 1); + } + + if ($valid){ + + $favourites = Favourites::getOrCreate(); + + $from = "From: ".favourites_configuration::getFromEmailAddress(); + + if (favourites_configuration::isEmailAdmin()) + { + $admin_email = $name." has chosen following photo as his or her favourites.\n"; + + // create the order items + $items = ORM::factory("item")->where("id","in", $favourites->contents)->find_all(); + foreach ($items->contents as $id=>$item){ + $admin_email = $admin_email." + ".$item->title." - ".$item->url().""; + } + $admin_email = $admin_email."\n you can view this favourite list at \n".$favourites->getUrl() + ."\n\n He or she has included the additional comments. \n".$comments + ."\n You can e-mail him or her with the following e-mail address ".$email_address; + + mail(favourites_configuration::getEmailAddress(), $name."'s favourites.", $admin_email, $from); + } + + $email = favourites_configuration::replaceStrings( + favourites_configuration::getEmailTemplate(), + Array( + "name"=>$name, + "comments"=>$comments, + "url"=>$favourites->getUrl(), + "owner"=>favourites_configuration::getOwner())); + + mail($email_address,$name."'s Favourites",$email, $from); + + json::reply(array("result" => "success", "location" => url::site("favourites"))); + return; + } + json::reply(array("result" => "error", "html" => (string)$form)); + } + + public function toggle_favourites($id){ + $favourites = Favourites::getOrCreate(); + $infavour = $favourites ->toggle($id); + $title = $infavour?t("Remove from favourites"):t("Add to favourites"); + json::reply(array("result" => "success", + "favourite" => $infavour, + "hasfavourites" => $favourites->hasFavourites(), + "title" => (string)$title)); + } + + public function clear_favourites(){ + Favourites::getOrCreate()->clear(); + } +} diff --git a/modules/favourites/css/favourites.css b/modules/favourites/css/favourites.css new file mode 100644 index 00000000..2f025504 --- /dev/null +++ b/modules/favourites/css/favourites.css @@ -0,0 +1,15 @@ +.icon-f{width:32px; height:32px; display:inline-block; background-image: url(../images/faves.png); position:absolute; top:20px; left:0; z-index:20} +.icon-f:hover{background-position: 0 -64px ;} +.icon-f.f-selected{background-position: 0 -32px ;} +.icon-f.f-working{background-position: 0 -96px ;} +#f-view-link {float:right;position:relative; width:50px; height:50px;} +#f-view-link a{width:64px; height:64px; display:inline-block;background-position: -96px 0px;background-image: url(../images/faves.png); position:absolute; top:15px; right:0;} +#f-view-link a:hover{background-position: -96px -64px ;} +#f-save-link {float:right;position:relative; width:64px; height:64px;} +#f-save-link a{width:64px; height:64px; display:inline-block;background-position: -32px 0px;background-image: url(../images/faves.png); position:absolute; top:15px; right:0;} +#f-save-link a:hover{background-position: -32px -64px ;} +.rtl .icon-f{right:0;left:auto;} +.rtl #f-view-link{float:left;} +.rtl #f-view-link a{left:0;right:auto;} +.rtl #f-save-link{float:left;} +.rtl #f-save-link a{left:0;right:auto;} \ No newline at end of file diff --git a/modules/favourites/helpers/favourites_configuration.php b/modules/favourites/helpers/favourites_configuration.php new file mode 100644 index 00000000..cae987f4 --- /dev/null +++ b/modules/favourites/helpers/favourites_configuration.php @@ -0,0 +1,144 @@ + "g-configure-form")); + + $group = $form->group("configure")->label(t("Configure Favourites")); + $group->dropdown("select_allow") + ->label(t("Please choose what a user can select as a favourite")) + ->options(Array(1=>t("Items only"), 2=>"albums only", 3=>"Both")); + $group->input("fromemail")->label(t("From Email address for site emails"))->id("g-from-email-address"); + $group->checkbox("email_admin")->label(t("Email site owner every saved favourites list"))->id("g-email-admin"); + $group->input("email")->label(t("Email address of Site Owner"))->id("g-owner-email-address"); + $group->input("owner")->label(t("Site Owners name"))->id("g-owner-name"); + $group->checkbox("users_only")->label(t("Only Registered users can create favourites"))->id("g-users-only"); + $group->textarea("email_template")->label(t("Email Template"))->id("g-email-template"); + $group->submit("")->value(t("Save")); + return $form; + } + + static function populateForm($form){ + $form->configure->email->value(favourites_configuration::getEmailAddress()); + $form->configure->fromemail->value(favourites_configuration::getFromEmailAddress()); + $form->configure->email_admin->checked(favourites_configuration::isEmailAdmin()); + $form->configure->users_only->checked(favourites_configuration::isUsersOnly()); + $form->configure->owner->value(favourites_configuration::getOwner()); + $form->configure->email_template->value(favourites_configuration::getEmailTemplate()); + $form->configure->select_allow->selected(favourites_configuration::getSelectAllow()); + } + + static function extractForm($form){ + $email = $form->configure->email->value; + $emailfrom = $form->configure->fromemail->value; + $owner = $form->configure->owner->value; + $is_email_admin = $form->configure->email_admin->value; + $is_users_only = $form->configure->users_only->value; + $email_template = $form->configure->email_template->value; + $select_from = $form->configure->select_allow->selected; + favourites_configuration::setEmailAddress($email); + favourites_configuration::setEmailAdmin($is_email_admin); + favourites_configuration::setFromEmailAddress($emailfrom); + favourites_configuration::setOwner($owner); + favourites_configuration::setUsersOnly($is_users_only); + favourites_configuration::setEmailTemplate($email_template); + favourites_configuration::setSelectAllow($select_from); + } + + static function replaceStrings($string, $key_values) { + // Replace x_y before replacing x. + krsort($key_values, SORT_STRING); + + $keys = array(); + $values = array(); + foreach ($key_values as $key => $value) { + $keys[] = "%$key"; + $values[] = $value; + } + return str_replace($keys, $values, $string); + } + + static function getEmailAddress(){ + return module::get_var("favourites","email"); + } + + static function setEmailAddress($email){ + module::set_var("favourites","email",$email); + } + + static function getOwner(){ + return module::get_var("favourites","owner"); + } + + static function setOwner($owner){ + module::set_var("favourites","owner",$owner); + } + + static function getFromEmailAddress(){ + return module::get_var("favourites","from_email"); + } + + static function setFromEmailAddress($fromemail){ + module::set_var("favourites","from_email",$fromemail); + } + + static function isEmailAdmin(){ + return module::get_var("favourites","email_admin"); + } + + static function setEmailAdmin($email_admin){ + module::set_var("favourites","email_admin",$email_admin); + } + + static function isUsersOnly(){ + return module::get_var("favourites","users_only"); + } + + static function setUsersOnly($users_only){ + module::set_var("favourites","users_only",$users_only); + } + + static function getSelectAllow(){ + return module::get_var("favourites","select_from",1); + } + + static function setSelectAllow($select_from){ + module::set_var("favourites","select_from",$select_from); + } + + static function getEmailTemplate(){ + return module::get_var("favourites","email_template"); + } + + static function setEmailTemplate($email_template){ + module::set_var("favourites","email_template",$email_template); + } + + static function canSelectAlbums(){ + return self::getSelectAllow()!=1; + } + + static function canSelectItems(){ + return self::getSelectAllow()!=2; + } + +} \ No newline at end of file diff --git a/modules/favourites/helpers/favourites_event.php b/modules/favourites/helpers/favourites_event.php new file mode 100644 index 00000000..a96ada02 --- /dev/null +++ b/modules/favourites/helpers/favourites_event.php @@ -0,0 +1,34 @@ +add_after("users_groups", + Menu::factory("link") + ->id("configure_favourites") + ->label(t("Favourites")) + ->url(url::site("admin/favourites_configure"))); + } + +} \ No newline at end of file diff --git a/modules/favourites/helpers/favourites_installer.php b/modules/favourites/helpers/favourites_installer.php new file mode 100644 index 00000000..91250521 --- /dev/null +++ b/modules/favourites/helpers/favourites_installer.php @@ -0,0 +1,37 @@ +css("favourites.css"); + $theme->script("favourites.js"); + } + + static function header_top($theme) { + + if (favourites_configuration::isUsersOnly() && identity::active_user()->name =="guest"){ + return; + } + + if ($theme->page_subtype=="favourites"){ + $view = new View("save_favourites.html"); + $view->favourites = Favourites::getOrCreate(); + return $view->render(); + } + else{ + $view = new View("view_favourites.html"); + $view->favourites = Favourites::getOrCreate(); + return $view->render(); + } + } + + static function photo_top($theme){ + if (!favourites_configuration::canSelectItems() || + (favourites_configuration::isUsersOnly() && identity::active_user()->name =="guest")){ + return; + } + + $view = new View("add_to_favourites.html"); + $view->item = $theme->item(); + $view->favourites = Favourites::getOrCreate(); + return $view->render(); + } + + static function thumb_top($theme, $item){ + if (favourites_configuration::isUsersOnly() && identity::active_user()->name =="guest"){ + return; + } + + if (($item->type=="album" && favourites_configuration::canSelectAlbums()) || + ($item->type!="album" && favourites_configuration::canSelectItems())){ + $view = new View("add_to_favourites.html"); + $view->item = $item; + $view->favourites = Favourites::getOrCreate(); + return $view->render(); + } + } + +} \ No newline at end of file diff --git a/modules/favourites/images/faves.png b/modules/favourites/images/faves.png new file mode 100644 index 00000000..ebcccad0 Binary files /dev/null and b/modules/favourites/images/faves.png differ diff --git a/modules/favourites/js/favourites.js b/modules/favourites/js/favourites.js new file mode 100644 index 00000000..1eac91a8 --- /dev/null +++ b/modules/favourites/js/favourites.js @@ -0,0 +1,30 @@ +$(window).load(function() { + var favlink = $("#f-view-link"); + + $(".icon-f").each(function(){ + var elem = $(this); + var href = elem.attr("href"); + function clickFavourite(e){ + elem.addClass("f-working"); + $.getJSON(href,function (data){ + elem.removeClass("f-working"); + if (data.favourite){ + elem.addClass("f-selected"); + elem.attr("title",data.title); + } + else{ + elem.removeClass("f-selected"); + elem.attr("title",data.title); + } + if (data.hasfavourites){ + favlink.css('display','block'); + }else{ + favlink.css('display','none'); + } + + }); + return false; + } + elem.bind("click",clickFavourite); + }); +}); \ No newline at end of file diff --git a/modules/favourites/libraries/Favourites.php b/modules/favourites/libraries/Favourites.php new file mode 100644 index 00000000..93af434c --- /dev/null +++ b/modules/favourites/libraries/Favourites.php @@ -0,0 +1,63 @@ +contents as $i => $value) { + if ($value==$id){ + unset($this->contents[$i]); + return false; + } + } + $this->contents[]=$id; + return true; + } + + public function contains($id){ + foreach ($this->contents as $i => $value){ + if ($value==$id) return true; + } + return false; + } + + public function hasFavourites(){ + return !empty($this->contents); + } + + public function get_as_album(){ + return Pseudo_album::create($this); + } + + public function clear(){ + $this->contents = array(); + } + + public function getUrl(){ + + $toReturn = url::site("favourites/view","http"); + + foreach ($this->contents as $i => $value){ + $toReturn = $toReturn."/".$value; + } + return $toReturn; + } + + public static function get(){ + return Session::instance()->get("favourites"); + } + + + public static function getOrCreate(){ + $session = Session::instance(); + + $favourites = $session->get("favourites"); + if (!$favourites) + { + $favourites = new Favourites(); + $session->set("favourites", $favourites); + } + return $favourites; + } +} diff --git a/modules/favourites/libraries/Pseudo_album.php b/modules/favourites/libraries/Pseudo_album.php new file mode 100644 index 00000000..b4372121 --- /dev/null +++ b/modules/favourites/libraries/Pseudo_album.php @@ -0,0 +1,396 @@ +favourites = $favourites; + // Set reasonable defaults + $this->created = time(); + $this->rand_key = ((float)mt_rand()) / (float)mt_getrandmax(); + $this->thumb_dirty = 1; + $this->resize_dirty = 1; + $this->sort_column = "created"; + $this->sort_order = "ASC"; + $this->owner_id = identity::active_user()->id; + $this->parent_id = 1; + + $this->id = 1; + $this->type="album"; + $this->title=t("Favourites"); + $this->description=t("Currently selected favourites"); + } + + public function parent(){ + return ORM::factory("item")->where("id","=",1)->find(); + } + + public static function create($favourites) + { + return new Pseudo_album($favourites); + } + + public function loaded(){ + return true; + } + + public function children_count(){ + return count($this->favourites->contents); + } + + public function parents(){ + return ORM::factory("item")->where("id","=", 1)->find_all(); + } + + /** + * Add a set of restrictions to any following queries to restrict access only to items + * viewable by the active user. + * @chainable + */ + public function viewable() { + return $this; + } + + /** + * Is this item an album? + * @return true if it's an album + */ + public function is_album() { + return true; + } + + /** + * Is this item a photo? + * @return true if it's a photo + */ + public function is_photo() { + return false; + } + + /** + * Is this item a movie? + * @return true if it's a movie + */ + public function is_movie() { + return false; + } + + public function delete($ignored_id=null) { + } + + /** + * Specify the path to the data file associated with this item. To actually associate it, + * you still have to call save(). + * @chainable + */ + public function set_data_file($data_file) { + } + + /** + * Return the server-relative url to this item, eg: + * /gallery3/index.php/BobsWedding?page=2 + * /gallery3/index.php/BobsWedding/Eating-Cake.jpg + * + * @param string $query the query string (eg "show=3") + */ + public function url($query=null) { + $url = url::site("favourites"); + if ($query) { + $url .= "?$query"; + } + return $url; + } + + /** + * Return the full url to this item, eg: + * http://example.com/gallery3/index.php/BobsWedding?page=2 + * http://example.com/gallery3/index.php/BobsWedding/Eating-Cake.jpg + * + * @param string $query the query string (eg "show=3") + */ + public function abs_url($query=null) { + $url = url::abs_site("favourites"); + if ($query) { + $url .= "?$query"; + } + return $url; + } + + /** + * album: /var/albums/album1/album2 + * photo: /var/albums/album1/album2/photo.jpg + */ + public function file_path() { + return VARPATH . "albums/"; + } + + /** + * album: http://example.com/gallery3/var/resizes/album1/ + * photo: http://example.com/gallery3/var/albums/album1/photo.jpg + */ + public function file_url($full_uri=false) { + return; + } + + /** + * album: /var/resizes/album1/.thumb.jpg + * photo: /var/albums/album1/photo.thumb.jpg + */ + public function thumb_path() { + } + + /** + * Return true if there is a thumbnail for this item. + */ + public function has_thumb() { + return false; + } + + /** + * album: http://example.com/gallery3/var/resizes/album1/.thumb.jpg + * photo: http://example.com/gallery3/var/albums/album1/photo.thumb.jpg + */ + public function thumb_url($full_uri=false) { + } + + /** + * album: /var/resizes/album1/.resize.jpg + * photo: /var/albums/album1/photo.resize.jpg + */ + public function resize_path() { + } + + /** + * album: http://example.com/gallery3/var/resizes/album1/.resize.jpg + * photo: http://example.com/gallery3/var/albums/album1/photo.resize.jpg + */ + public function resize_url($full_uri=false) { + } + + + /** + * Return the relative path to this item's file. Note that the components of the path are + * urlencoded so if you want to use this as a filesystem path, you need to call urldecode + * on it. + * @return string + */ + public function relative_path() { + if (!$this->loaded()) { + return; + } + + if (!isset($this->relative_path_cache)) { + $this->_build_relative_caches()->save(); + } + return $this->relative_path_cache; + } + + /** + * Return the relative url to this item's file. + * @return string + */ + public function relative_url() { + } + + + /** + * Handle any business logic necessary to create or modify an item. + * @see ORM::save() + * + * @return ORM Item_Model + */ + public function save() { + } + + /** + * Return the Item_Model representing the cover for this album. + * @return Item_Model or null if there's no cover + */ + public function album_cover() { + return null; + } + + /** + * Find the position of the given child id in this album. The resulting value is 1-indexed, so + * the first child in the album is at position 1. + */ + public function get_position($child, $where=array()) { + /* + if ($this->sort_order == "DESC") { + $comp = ">"; + } else { + $comp = "<"; + } + $db = db::build(); + + // If the comparison column has NULLs in it, we can't use comparators on it and will have to + // deal with it the hard way. + $count = $db->from("items") + ->where("parent_id", "=", $this->id) + ->where($this->sort_column, "IS", null) + ->merge_where($where) + ->count_records(); + + if (empty($count)) { + // There are no NULLs in the sort column, so we can just use it directly. + $sort_column = $this->sort_column; + + $position = $db->from("items") + ->where("parent_id", "=", $this->id) + ->where($sort_column, $comp, $child->$sort_column) + ->merge_where($where) + ->count_records(); + + // We stopped short of our target value in the sort (notice that we're using a < comparator + // above) because it's possible that we have duplicate values in the sort column. An + // equality check would just arbitrarily pick one of those multiple possible equivalent + // columns, which would mean that if you choose a sort order that has duplicates, it'd pick + // any one of them as the child's "position". + // + // Fix this by doing a 2nd query where we iterate over the equivalent columns and add them to + // our base value. + foreach ($db + ->select("id") + ->from("items") + ->where("parent_id", "=", $this->id) + ->where($sort_column, "=", $child->$sort_column) + ->merge_where($where) + ->order_by(array("id" => "ASC")) + ->execute() as $row) { + $position++; + if ($row->id == $child->id) { + break; + } + } + } else { + // There are NULLs in the sort column, so we can't use MySQL comparators. Fall back to + // iterating over every child row to get to the current one. This can be wildly inefficient + // for really large albums, but it should be a rare case that the user is sorting an album + // with null values in the sort column. + // + // Reproduce the children() functionality here using Database directly to avoid loading the + // whole ORM for each row. + $order_by = array($this->sort_column => $this->sort_order); + // Use id as a tie breaker + if ($this->sort_column != "id") { + $order_by["id"] = "ASC"; + } + + $position = 0; + foreach ($db->select("id") + ->from("items") + ->where("parent_id", "=", $this->id) + ->merge_where($where) + ->order_by($order_by) + ->execute() as $row) { + $position++; + if ($row->id == $child->id) { + break; + } + } + } + + return $position;*/ + } + + /** + * Return an tag for the thumbnail. + * @param array $extra_attrs Extra attributes to add to the img tag + * @param int (optional) $max Maximum size of the thumbnail (default: null) + * @param boolean (optional) $center_vertically Center vertically (default: false) + * @return string + */ + public function thumb_img($extra_attrs=array(), $max=null, $center_vertically=false) { + return ""; + } + + /** + * Calculate the largest width/height that fits inside the given maximum, while preserving the + * aspect ratio. + * @param int $max Maximum size of the largest dimension + * @return array + */ + public function scale_dimensions($max) { + } + + /** + * Return an tag for the resize. + * @param array $extra_attrs Extra attributes to add to the img tag + * @return string + */ + public function resize_img($extra_attrs) { + } + + /** + * Return a flowplayer \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/0A21C4AA9FA3F1812B8077A68729DA52.cache.html b/modules/gwtorganise/war/g3viewer/0A21C4AA9FA3F1812B8077A68729DA52.cache.html deleted file mode 100644 index 135a2b8c..00000000 --- a/modules/gwtorganise/war/g3viewer/0A21C4AA9FA3F1812B8077A68729DA52.cache.html +++ /dev/null @@ -1,314 +0,0 @@ - \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/0AB3C6DF30C08F43EAA999A9F920C30B.cache.html b/modules/gwtorganise/war/g3viewer/0AB3C6DF30C08F43EAA999A9F920C30B.cache.html deleted file mode 100644 index f3c8cee2..00000000 --- a/modules/gwtorganise/war/g3viewer/0AB3C6DF30C08F43EAA999A9F920C30B.cache.html +++ /dev/null @@ -1,1818 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/0D97DF37194D1924CC80394AAA96B9A3.cache.html b/modules/gwtorganise/war/g3viewer/0D97DF37194D1924CC80394AAA96B9A3.cache.html new file mode 100644 index 00000000..eb93e477 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/0D97DF37194D1924CC80394AAA96B9A3.cache.html @@ -0,0 +1,1728 @@ + + + + + + \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/27AC86F0820D8F960DBF73C151C0332B.cache.html b/modules/gwtorganise/war/g3viewer/27AC86F0820D8F960DBF73C151C0332B.cache.html new file mode 100644 index 00000000..6ae3eb2f --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/27AC86F0820D8F960DBF73C151C0332B.cache.html @@ -0,0 +1,1733 @@ + + + + + + \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/3295227D4A416F64C8B3061D11DFABA0.cache.html b/modules/gwtorganise/war/g3viewer/3295227D4A416F64C8B3061D11DFABA0.cache.html deleted file mode 100644 index a1710d65..00000000 --- a/modules/gwtorganise/war/g3viewer/3295227D4A416F64C8B3061D11DFABA0.cache.html +++ /dev/null @@ -1,1777 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/371B2293E0881C8A53FDA41CA333A843.cache.html b/modules/gwtorganise/war/g3viewer/371B2293E0881C8A53FDA41CA333A843.cache.html deleted file mode 100644 index a8754f7a..00000000 --- a/modules/gwtorganise/war/g3viewer/371B2293E0881C8A53FDA41CA333A843.cache.html +++ /dev/null @@ -1,1795 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/46E36699DD51342BCC1877A718D3B6D5.cache.html b/modules/gwtorganise/war/g3viewer/46E36699DD51342BCC1877A718D3B6D5.cache.html deleted file mode 100644 index 08cf6363..00000000 --- a/modules/gwtorganise/war/g3viewer/46E36699DD51342BCC1877A718D3B6D5.cache.html +++ /dev/null @@ -1,326 +0,0 @@ - \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/4AFE598FDFDF189DD61F57E554328B10.cache.html b/modules/gwtorganise/war/g3viewer/4AFE598FDFDF189DD61F57E554328B10.cache.html new file mode 100644 index 00000000..9f1d2b2a --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/4AFE598FDFDF189DD61F57E554328B10.cache.html @@ -0,0 +1,1840 @@ + + + + + + \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/4E8EC2279CB4B46228EFF0682ED166A4.cache.html b/modules/gwtorganise/war/g3viewer/4E8EC2279CB4B46228EFF0682ED166A4.cache.html new file mode 100644 index 00000000..7fa662e1 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/4E8EC2279CB4B46228EFF0682ED166A4.cache.html @@ -0,0 +1,1821 @@ + + + + + + \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/4F7AD7D8299143D876CB4071BE00BF02.cache.html b/modules/gwtorganise/war/g3viewer/4F7AD7D8299143D876CB4071BE00BF02.cache.html new file mode 100644 index 00000000..71d67f32 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/4F7AD7D8299143D876CB4071BE00BF02.cache.html @@ -0,0 +1,1862 @@ + + + + + + \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/6462B363383D23B8418857B7A6FAD85B.cache.html b/modules/gwtorganise/war/g3viewer/6462B363383D23B8418857B7A6FAD85B.cache.html new file mode 100644 index 00000000..e3bf202e --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/6462B363383D23B8418857B7A6FAD85B.cache.html @@ -0,0 +1,1835 @@ + + + + + + \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/71ED95F3DFB964762667E45E2922704D.cache.html b/modules/gwtorganise/war/g3viewer/71ED95F3DFB964762667E45E2922704D.cache.html new file mode 100644 index 00000000..d3b48c83 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/71ED95F3DFB964762667E45E2922704D.cache.html @@ -0,0 +1,1687 @@ + + + + + + \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/826A0FAD0C07BC304C641864F5274BFC.cache.html b/modules/gwtorganise/war/g3viewer/826A0FAD0C07BC304C641864F5274BFC.cache.html deleted file mode 100644 index 57c4200d..00000000 --- a/modules/gwtorganise/war/g3viewer/826A0FAD0C07BC304C641864F5274BFC.cache.html +++ /dev/null @@ -1,1819 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/884CB866FECF37EDDE4914CA60AF2511.cache.html b/modules/gwtorganise/war/g3viewer/884CB866FECF37EDDE4914CA60AF2511.cache.html new file mode 100644 index 00000000..70fc28c4 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/884CB866FECF37EDDE4914CA60AF2511.cache.html @@ -0,0 +1,1701 @@ + + + + + + \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/9DC95FB4BEC084EF810751F04B440FD7.cache.html b/modules/gwtorganise/war/g3viewer/9DC95FB4BEC084EF810751F04B440FD7.cache.html new file mode 100644 index 00000000..59d502f2 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/9DC95FB4BEC084EF810751F04B440FD7.cache.html @@ -0,0 +1,1706 @@ + + + + + + \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/A8FBB0ADAFEE7F8EA1CDB15765D13A7F.cache.html b/modules/gwtorganise/war/g3viewer/A8FBB0ADAFEE7F8EA1CDB15765D13A7F.cache.html new file mode 100644 index 00000000..87e12a44 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/A8FBB0ADAFEE7F8EA1CDB15765D13A7F.cache.html @@ -0,0 +1,1863 @@ + + + + + + \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/AE48EA5D8ECD3E90C23EBF393DC6958A.cache.html b/modules/gwtorganise/war/g3viewer/AE48EA5D8ECD3E90C23EBF393DC6958A.cache.html deleted file mode 100644 index 4b77477f..00000000 --- a/modules/gwtorganise/war/g3viewer/AE48EA5D8ECD3E90C23EBF393DC6958A.cache.html +++ /dev/null @@ -1,1823 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/B71911CF996F6E89D496C872F18EA45B.cache.html b/modules/gwtorganise/war/g3viewer/B71911CF996F6E89D496C872F18EA45B.cache.html deleted file mode 100644 index 952fbc55..00000000 --- a/modules/gwtorganise/war/g3viewer/B71911CF996F6E89D496C872F18EA45B.cache.html +++ /dev/null @@ -1,311 +0,0 @@ - \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/C0A3E821CD3689650D1DF0CEF5C506A9.cache.html b/modules/gwtorganise/war/g3viewer/C0A3E821CD3689650D1DF0CEF5C506A9.cache.html deleted file mode 100644 index 296597ca..00000000 --- a/modules/gwtorganise/war/g3viewer/C0A3E821CD3689650D1DF0CEF5C506A9.cache.html +++ /dev/null @@ -1,1791 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/CE15F73DB4EDED1CF8F93F95A728792D.cache.html b/modules/gwtorganise/war/g3viewer/CE15F73DB4EDED1CF8F93F95A728792D.cache.html new file mode 100644 index 00000000..45651178 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/CE15F73DB4EDED1CF8F93F95A728792D.cache.html @@ -0,0 +1,1868 @@ + + + + + + \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/D096B0ED44CBABF1A6B1F2C2D31F4FCC.cache.html b/modules/gwtorganise/war/g3viewer/D096B0ED44CBABF1A6B1F2C2D31F4FCC.cache.html new file mode 100644 index 00000000..d6666f29 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/D096B0ED44CBABF1A6B1F2C2D31F4FCC.cache.html @@ -0,0 +1,1729 @@ + + + + + + \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/DB10FC871F1917C3CF43B2E1A192D050.cache.html b/modules/gwtorganise/war/g3viewer/DB10FC871F1917C3CF43B2E1A192D050.cache.html deleted file mode 100644 index c32b9730..00000000 --- a/modules/gwtorganise/war/g3viewer/DB10FC871F1917C3CF43B2E1A192D050.cache.html +++ /dev/null @@ -1,308 +0,0 @@ - \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/G3viewer.css b/modules/gwtorganise/war/g3viewer/G3viewer.css index 6e2c79a6..c6f40841 100644 --- a/modules/gwtorganise/war/g3viewer/G3viewer.css +++ b/modules/gwtorganise/war/g3viewer/G3viewer.css @@ -15,8 +15,8 @@ .infobar {background-color: #fff; position: absolute; bottom:0px; border-width: 4px 4px 0 4px; border-style: solid; border-color: #d2e1f6; height: 15px; width: 240px; right: 50px; font-size:10px; padding: 2px 5px 1px 5px;} .infobar div {float:right; } -.infobar a {float:left;} -.loading{position:absolute; top:0px; left:0px; width:100%; height: 100%; background-color:#FFF; opacity: 0.7; filter: alpha(opacity = 70);} +.infobar .up-options {float:left;} +.loading{position:absolute; top:0px; left:0px; width:100%; height: 100%; background-color:#FFF; opacity: 0.7; filter: alpha(opacity=70);} .loading-label{z-index:10; position:absolute; width:100%; left:0px; text-align:center;} .loading-image{z-index:10;} .gwt-TreeItem-selected .Tree-Album {background-color: #333; color: #FFF;} @@ -24,6 +24,8 @@ .Tree-Album:hover{text-decoration:underline;} .drop-target{background-color: #91c0ef; color: #000;} +.dragdrop-selected ,.dragdrop-dragging ,.dragdrop-proxy {filter: Alpha(Opacity=30) !important;;} + .popup {padding: 2px; border: 1px solid #91c0ef;background-color:#FFF} .dialog fieldset{ border: none; padding: 0px; margin: 0px;} diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/015D751F4204508258E3AD3E74E19E72/1.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/015D751F4204508258E3AD3E74E19E72/1.cache.js deleted file mode 100644 index 4c902a9c..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/015D751F4204508258E3AD3E74E19E72/1.cache.js +++ /dev/null @@ -1,7 +0,0 @@ -function _g(){} -function Zg(){} -function eh(){} -function Yg(){} -function bh(){bh=wp;ah=new Zg} -function dh(){ah=(bh(),new Yg);dc((ac(),_b),1);!!$stats&&$stats(Fc(Qr,Rr,null,null));ah.m();!!$stats&&$stats(Fc(Qr,Sr,null,null))} -var Qr='runCallbacks1';_=Zg.prototype=new O;_.m=_g;_.tI=0;_=Yg.prototype=new Zg;_.m=eh;_.tI=0;var ah;dh(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/015D751F4204508258E3AD3E74E19E72/2.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/015D751F4204508258E3AD3E74E19E72/2.cache.js deleted file mode 100644 index af900388..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/015D751F4204508258E3AD3E74E19E72/2.cache.js +++ /dev/null @@ -1,7 +0,0 @@ -function ih(){} -function gh(){} -function nh(){} -function fh(){} -function kh(){kh=wp;jh=new gh} -function mh(){jh=(kh(),new fh);dc((ac(),_b),2);!!$stats&&$stats(Fc(Tr,Rr,null,null));jh.m();!!$stats&&$stats(Fc(Tr,Sr,null,null))} -var Tr='runCallbacks2';_=gh.prototype=new O;_.m=ih;_.tI=0;_=fh.prototype=new gh;_.m=nh;_.tI=0;var jh;mh(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/015D751F4204508258E3AD3E74E19E72/3.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/015D751F4204508258E3AD3E74E19E72/3.cache.js deleted file mode 100644 index e6b2d526..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/015D751F4204508258E3AD3E74E19E72/3.cache.js +++ /dev/null @@ -1,75 +0,0 @@ -function $b(){} -function lc(){} -function uc(){} -function xc(){} -function Nc(){} -function Qk(){} -function Pk(){} -function Cn(){} -function Jn(){} -function On(){} -function Eo(){} -function Po(){} -function Yo(){} -function kc(){fc(_b)} -function fc(a){dc(a,a.c)} -function Bc(a){Ac(this,a)} -function qc(a){a.b=0;a.c=0} -function tc(a){return a.c-a.b} -function Vk(){return this.a} -function Wk(){return this.a} -function Oo(){return this.b} -function Xo(){return Vo(this)} -function rc(a){return a.a[a.b]} -function pc(a,b){a.a[a.c++]=b} -function wc(a,b){Hd();return a} -function zc(a,b){a.a=b;return a} -function Tk(a,b){a.a=b;return a} -function Ln(a,b){a.a=b;return a} -function Sn(){return Jo(this,0)} -function In(){return this.b.a.d} -function sc(a){return a.a[a.b++]} -function Mn(){return jn(this.a.a)} -function Gn(a){return Yl(this.a,a)} -function Wo(){return this.b!=this.d.a} -function $o(a){a.a=a.b=a;return a} -function Pc(a,b,c){a.b=b;a.a=c;return a} -function En(a,b,c){a.a=b;a.b=c;return a} -function No(a){return _o(new Yo,a,this.a),++this.b,true} -function Mo(a){if(a.b==0){throw pp(new np)}} -function Go(a){a.a=$o(new Yo);a.b=0;return a} -function Io(a,b,c){_o(new Yo,b,c);++a.b} -function So(a,b,c,d){a.d=d;a.b=c;a.a=b;return a} -function _o(a,b,c){a.c=b;a.a=c;a.b=c.b;c.b.a=a;c.b=a;return a} -function oc(a,b){a.a=_f(Cg,0,-1,b,1);return a} -function $k(){$k=wp;Zk=_f(Eg,0,12,256,0)} -function ac(){ac=wp;_b=cc(new $b,3,ag(Cg,0,-1,[]))} -function Ol(a){var b;b=rm(new lm,a);return En(new Cn,a,b)} -function Nn(){var a;a=pg(kn(this.a.a),20).D();return a} -function Hn(){var a;a=Am(new ym,this.b.a);return Ln(new Jn,a)} -function Qn(a,b){var c;c=Jo(this,a);Io(c.d,b,c.b);++c.a;c.c=null} -function Ko(a){var b;Mo(a);--a.b;b=a.a.a;b.a.b=b.b;b.b.a=b.a;b.a=b.b=b;return b.c} -function Uk(a){return a!=null&&ng(a.tI,12)&&pg(a,12).a==this.a} -function nk(b){var a=b;$wnd.setTimeout(function(){a.onreadystatechange=new Function},0)} -function tk(c,a){var b=c;c.onreadystatechange=$entry(function(){a.i(b)})} -function Xl(e,a){var b=e.e;for(var c in b){if(c.charCodeAt(0)==58){var d=b[c];if(e.B(a,d)){return true}}}return false} -function Lc(b,c){function d(a){c.h(a)} -return __gwtStartLoadingFragment(b,d)} -function Yl(a,b){if(a.c&&qo(a.b,b)){return true}else if(Xl(a,b)){return true}else if(Vl(a,b)){return true}return false} -function Vo(a){if(a.b==a.d.a){throw pp(new np)}a.c=a.b;a.b=a.b.a;++a.a;return a.c.c} -function cc(a,b,c){ac();a.a=po(new no);a.f=Go(new Eo);a.c=b;a.b=c;a.e=oc(new lc,b+1);return a} -function Mc(a,b){var c,d;c=Lc(a,b);if(c==null){return}d=uk();d.open(Xr,c,true);tk(d,Pc(new Nc,d,b));d.send(null)} -function dc(a,b){var c;c=b==a.c?Ur:Vr+b;hc(c,Sr,Xk(b),null);if(ec(a,b)){sc(a.d);gm(a.a,Xk(b));jc(a)}} -function Jo(a,b){var c,d;(b<0||b>a.b)&&cn(b,a.b);if(b>=a.b>>1){d=a.a;for(c=a.b;c>b;--c){d=d.b}}else{d=a.a.a;for(c=0;c-129&&a<128){b=a+128;c=($k(),Zk)[b];!c&&(c=Zk[b]=Tk(new Pk,a));return c}return Tk(new Pk,a)} -function Vl(i,a){var b=i.a;for(var c in b){if(c==parseInt(c)){var d=b[c];for(var e=0,f=d.length;e0){Xn(h,pg(Ko(b.a.f),2));sc(b.a.e)}qc(b.a.e);Zn(h,Ol(b.a.a));Ul(b.a.a);i=null;for(g=hn(new en,h);g.a1){return}if(tc(a.d)>0){c=rc(a.d);hc(c==a.c?Ur:Vr+c,Rr,Xk(c),null);Mc(c,zc(new xc,a));return}while(tc(a.e)>0){c=sc(a.e);b=pg(Ko(a.f),2);hc(c==a.c?Ur:Vr+c,Rr,Xk(c),null);Mc(c,b)}} -var $r="Can't get element ",Xr='GET',Yr='MSXML2.XMLHTTP.3.0',Zr='Microsoft.XMLHTTP',Rr='begin',Vr='download',Sr='end',Ur='leftoversDownload',Wr='runAsync';_=$b.prototype=new O;_.tI=0;_.b=null;_.c=0;_.d=null;_.e=null;var _b;_=lc.prototype=new O;_.tI=0;_.a=null;_.b=0;_.c=0;_=uc.prototype=new mb;_.tI=7;_=xc.prototype=new O;_.h=Bc;_.tI=8;_.a=null;_=Nc.prototype=new O;_.i=Qc;_.tI=0;_.a=null;_.b=null;_=Qk.prototype=new O;_.tI=27;_=Pk.prototype=new Qk;_.eQ=Uk;_.hC=Vk;_.w=Wk;_.tI=30;_.a=0;var Zk;_=Cn.prototype=new Dl;_.y=Gn;_.s=Hn;_.z=In;_.tI=0;_.a=null;_.b=null;_=Jn.prototype=new O;_.u=Mn;_.v=Nn;_.tI=0;_.a=null;_=On.prototype=new Wm;_.F=Qn;_.G=Rn;_.s=Sn;_.tI=41;_=Eo.prototype=new On;_.x=No;_.z=Oo;_.tI=45;_.a=null;_.b=0;_=Po.prototype=new O;_.u=Wo;_.v=Xo;_.tI=0;_.a=0;_.b=null;_.c=null;_.d=null;_=Yo.prototype=new O;_.tI=0;_.a=null;_.b=null;_.c=null;var Cg=new Ak,Eg=new Ak;kc(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/0A21C4AA9FA3F1812B8077A68729DA52/1.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/0A21C4AA9FA3F1812B8077A68729DA52/1.cache.js deleted file mode 100644 index 5b08821d..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/0A21C4AA9FA3F1812B8077A68729DA52/1.cache.js +++ /dev/null @@ -1,7 +0,0 @@ -function Xg(){} -function Vg(){} -function ah(){} -function Ug(){} -function Zg(){Zg=np;Yg=new Vg} -function _g(){Yg=(Zg(),new Ug);ac((Zb(),Yb),1);!!$stats&&$stats(Cc(yr,zr,null,null));Yg.m();!!$stats&&$stats(Cc(yr,Ar,null,null))} -var yr='runCallbacks1';_=Vg.prototype=new O;_.m=Xg;_.tI=0;_=Ug.prototype=new Vg;_.m=ah;_.tI=0;var Yg;_g(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/0A21C4AA9FA3F1812B8077A68729DA52/2.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/0A21C4AA9FA3F1812B8077A68729DA52/2.cache.js deleted file mode 100644 index eb494981..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/0A21C4AA9FA3F1812B8077A68729DA52/2.cache.js +++ /dev/null @@ -1,7 +0,0 @@ -function eh(){} -function ch(){} -function jh(){} -function bh(){} -function gh(){gh=np;fh=new ch} -function ih(){fh=(gh(),new bh);ac((Zb(),Yb),2);!!$stats&&$stats(Cc(Br,zr,null,null));fh.m();!!$stats&&$stats(Cc(Br,Ar,null,null))} -var Br='runCallbacks2';_=ch.prototype=new O;_.m=eh;_.tI=0;_=bh.prototype=new ch;_.m=jh;_.tI=0;var fh;ih(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/0A21C4AA9FA3F1812B8077A68729DA52/3.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/0A21C4AA9FA3F1812B8077A68729DA52/3.cache.js deleted file mode 100644 index f4471a59..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/0A21C4AA9FA3F1812B8077A68729DA52/3.cache.js +++ /dev/null @@ -1,75 +0,0 @@ -function Xb(){} -function ic(){} -function rc(){} -function uc(){} -function Kc(){} -function Hk(){} -function Gk(){} -function tn(){} -function An(){} -function Fn(){} -function vo(){} -function Go(){} -function Po(){} -function hc(){cc(Yb)} -function cc(a){ac(a,a.d)} -function yc(a){xc(this,a)} -function nc(a){a.c=0;a.d=0} -function qc(a){return a.d-a.c} -function Mk(){return this.b} -function Nk(){return this.b} -function Fo(){return this.c} -function Oo(){return Mo(this)} -function oc(a){return a.b[a.c]} -function mc(a,b){a.b[a.d++]=b} -function tc(a,b){Ed();return a} -function wc(a,b){a.b=b;return a} -function Kk(a,b){a.b=b;return a} -function Cn(a,b){a.b=b;return a} -function Jn(){return Ao(this,0)} -function zn(){return this.c.b.e} -function pc(a){return a.b[a.c++]} -function Dn(){return _m(this.b.b)} -function xn(a){return Pl(this.b,a)} -function No(){return this.c!=this.e.b} -function Ro(a){a.b=a.c=a;return a} -function Mc(a,b,c){a.c=b;a.b=c;return a} -function vn(a,b,c){a.b=b;a.c=c;return a} -function Eo(a){return So(new Po,a,this.b),++this.c,true} -function Do(a){if(a.c==0){throw gp(new ep)}} -function xo(a){a.b=Ro(new Po);a.c=0;return a} -function zo(a,b,c){So(new Po,b,c);++a.c} -function Jo(a,b,c,d){a.e=d;a.c=c;a.b=b;return a} -function So(a,b,c){a.d=b;a.b=c;a.c=c.c;c.c.b=a;c.c=a;return a} -function lc(a,b){a.b=Xf(yg,0,-1,b,1);return a} -function Rk(){Rk=np;Qk=Xf(Ag,0,12,256,0)} -function Zb(){Zb=np;Yb=_b(new Xb,3,Yf(yg,0,-1,[]))} -function Fl(a){var b;b=im(new cm,a);return vn(new tn,a,b)} -function En(){var a;a=lg(an(this.b.b),20).D();return a} -function yn(){var a;a=rm(new pm,this.c.b);return Cn(new An,a)} -function Hn(a,b){var c;c=Ao(this,a);zo(c.e,b,c.c);++c.b;c.d=null} -function Bo(a){var b;Do(a);--a.c;b=a.b.b;b.b.c=b.c;b.c.b=b.b;b.b=b.c=b;return b.d} -function Lk(a){return a!=null&&jg(a.tI,12)&&lg(a,12).b==this.b} -function ec(a,b,c,d){!!$stats&&$stats(Cc(a,b,c,d))} -function Ic(b,c){function d(a){c.i(a)} -return __gwtStartLoadingFragment(b,d)} -function Pl(a,b){if(a.d&&ho(a.c,b)){return true}else if(Ol(a,b)){return true}else if(Ml(a,b)){return true}return false} -function Mo(a){if(a.c==a.e.b){throw gp(new ep)}a.d=a.c;a.c=a.c.b;++a.b;return a.d.d} -function _b(a,b,c){Zb();a.b=go(new eo);a.g=xo(new vo);a.d=b;a.c=c;a.f=lc(new ic,b+1);return a} -function ek(b){var a=b;$wnd.setTimeout(function(){a.onreadystatechange=new Function},0)} -function kk(c,a){var b=c;c.onreadystatechange=$entry(function(){a.j(b)})} -function Ol(e,a){var b=e.f;for(var c in b){if(c.charCodeAt(0)==58){var d=b[c];if(e.B(a,d)){return true}}}return false} -function Ml(i,a){var b=i.b;for(var c in b){if(c==parseInt(c)){var d=b[c];for(var e=0,f=d.length;ea.c)&&Vm(b,a.c);if(b>=a.c>>1){d=a.b;for(c=a.c;c>b;--c){d=d.c}}else{d=a.b.b;for(c=0;c-129&&a<128){b=a+128;c=(Rk(),Qk)[b];!c&&(c=Qk[b]=Kk(new Gk,a));return c}return Kk(new Gk,a)} -function lk(){if($wnd.XMLHttpRequest){return new XMLHttpRequest}else{try{return new ActiveXObject(Gr)}catch(a){return new ActiveXObject(Hr)}}} -function xc(b,c){var a,e,f,g,h,i;h=Nn(new Kn);while(qc(b.b.f)>0){On(h,lg(Bo(b.b.g),2));pc(b.b.f)}nc(b.b.f);Qn(h,Fl(b.b.b));Ll(b.b.b);i=null;for(g=$m(new Xm,h);g.b1){return}if(qc(a.e)>0){c=oc(a.e);ec(c==a.d?Cr:Dr+c,zr,Ok(c),null);Jc(c,wc(new uc,a));return}while(qc(a.f)>0){c=pc(a.f);b=lg(Bo(a.g),2);ec(c==a.d?Cr:Dr+c,zr,Ok(c),null);Jc(c,b)}} -var Ir="Can't get element ",Fr='GET',Gr='MSXML2.XMLHTTP.3.0',Hr='Microsoft.XMLHTTP',zr='begin',Dr='download',Ar='end',Cr='leftoversDownload',Er='runAsync';_=Xb.prototype=new O;_.tI=0;_.c=null;_.d=0;_.e=null;_.f=null;var Yb;_=ic.prototype=new O;_.tI=0;_.b=null;_.c=0;_.d=0;_=rc.prototype=new mb;_.tI=7;_=uc.prototype=new O;_.i=yc;_.tI=8;_.b=null;_=Kc.prototype=new O;_.j=Nc;_.tI=0;_.b=null;_.c=null;_=Hk.prototype=new O;_.tI=27;_=Gk.prototype=new Hk;_.eQ=Lk;_.hC=Mk;_.w=Nk;_.tI=30;_.b=0;var Qk;_=tn.prototype=new ul;_.y=xn;_.s=yn;_.z=zn;_.tI=0;_.b=null;_.c=null;_=An.prototype=new O;_.u=Dn;_.v=En;_.tI=0;_.b=null;_=Fn.prototype=new Nm;_.F=Hn;_.G=In;_.s=Jn;_.tI=41;_=vo.prototype=new Fn;_.x=Eo;_.z=Fo;_.tI=45;_.b=null;_.c=0;_=Go.prototype=new O;_.u=No;_.v=Oo;_.tI=0;_.b=0;_.c=null;_.d=null;_.e=null;_=Po.prototype=new O;_.tI=0;_.b=null;_.c=null;_.d=null;var yg=new rk,Ag=new rk;hc(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/0AB3C6DF30C08F43EAA999A9F920C30B/1.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/0AB3C6DF30C08F43EAA999A9F920C30B/1.cache.js deleted file mode 100644 index 6ce711bd..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/0AB3C6DF30C08F43EAA999A9F920C30B/1.cache.js +++ /dev/null @@ -1,7 +0,0 @@ -function qT(){} -function CT(){return UP} -function GT(){var a;while(vT){a=vT;vT=vT.b;!vT&&(wT=null);Yv(a.a.a)}} -function xv(a,b){bcb(a.e,b);if(!a.d){a.d=true;yv(a)}a.b=false;zv(a)} -function Yv(a){var b;a.a.a=a.a.b.blob;(Dv(),Cv).captureBlob(a.a.a,a.a.e,Mtb);b=__(new Y_,a.a.e);a.a.c.rb(b);xv(a.a.i,a.a)} -function DT(){yT=true;xT=(AT(),new qT);My((Jy(),Iy),1);!!$stats&&$stats(qz(Ntb,akb,null,null));xT.Zb();!!$stats&&$stats(qz(Ntb,Otb,null,null))} -var Ptb='AsyncLoader1',Mtb='image/JPEG',Ntb='runCallbacks1';_=qT.prototype=new rT;_.gC=CT;_.Zb=GT;_.tI=0;var UP=B5(urb,Ptb);DT(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/0AB3C6DF30C08F43EAA999A9F920C30B/2.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/0AB3C6DF30C08F43EAA999A9F920C30B/2.cache.js deleted file mode 100644 index 1278fc96..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/0AB3C6DF30C08F43EAA999A9F920C30B/2.cache.js +++ /dev/null @@ -1,6 +0,0 @@ -function OT(){} -function $T(){return YP} -function cU(){var a;while(TT){a=TT;TT=TT.b;!TT&&(UT=null);so(a.a)}} -function _T(){WT=true;VT=(YT(),new OT);My((Jy(),Iy),2);!!$stats&&$stats(qz(Rtb,akb,null,null));VT.Zb();!!$stats&&$stats(qz(Rtb,Otb,null,null))} -function so(a){var b,c,d,e,f;e=($wnd.google&&$wnd.google.gears&&$wnd.google.gears.factory).create(Qtb);e.decode(a.a);d=e.width;c=e.height;f=d/a.b.b;b=c/a.b.a;if(f>b){if(f>1){e.resize(a.b.b,~~Math.max(Math.min(c/f,2147483647),-2147483648));Jv(a.c,e.encode());return}Jv(a.c,a.a)}else{if(b>1){e.resize(~~Math.max(Math.min(d/b,2147483647),-2147483648),a.b.a);Jv(a.c,e.encode());return}Jv(a.c,a.a)}} -var Stb='AsyncLoader2',Qtb='beta.canvas',Rtb='runCallbacks2';_=OT.prototype=new PT;_.gC=$T;_.Zb=cU;_.tI=0;var YP=B5(urb,Stb);_T(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/0AB3C6DF30C08F43EAA999A9F920C30B/3.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/0AB3C6DF30C08F43EAA999A9F920C30B/3.cache.js deleted file mode 100644 index ba08400e..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/0AB3C6DF30C08F43EAA999A9F920C30B/3.cache.js +++ /dev/null @@ -1,35 +0,0 @@ -function po(){} -function Lv(){} -function Qv(){} -function ST(){} -function PT(){} -function dU(){} -function hU(){} -function Uy(){Py(Iy)} -function to(){return ON} -function Pv(){return CO} -function Uv(){return DO} -function RT(){return XP} -function fU(){return VP} -function jU(){return WP} -function Py(a){My(a,a.d)} -function Nv(a,b){a.a=b;return a} -function Sv(a,b){a.a=b;return a} -function YT(){YT=Ycb;VT=new PT} -function gU(a){YT();XT=false;bU(a)} -function $I(a,b){if(!a){return}Tv(a,b)} -function vv(a,b){L8(a.f.a,b)!=null;zv(a);yv(a);dt(a.a.d)} -function Iv(a){if(a.h.c){(DB(),a.d.H).innerText=Ttb;aU(ro(new po,a.a,a))}else{Jv(a,a.a)}} -function mw(a,b,c){var d;d=g3(a.f,b);Os(a,c,a.H,d,true);Ps(a,b)} -function bJ(c,b){c.onprogress=function(a){cJ(b,a)}} -function yv(a){var b;if(a.e.b>0){b=JM(dcb(a.e),37);Iv(b)}else{a.d=false}} -function cJ(a,b){var c;if(!a){return}c=b.loaded/b.total;a.a.g.a.ab(WM(Math.floor(c*100))+$tb)} -function bU(a){YT();while(TT){Vo();Uq(br(new sp,_tb+Fh(a)));TT=TT.b}UT=null} -function ro(a,b,c){a.a=b;a.c=c;a.b=c.h;return a} -function My(a,b){var c;c=b==a.d?$jb:_jb+b;Ry(c,Otb,A6(b),null);if(Oy(a,b)){bz(a.e);L8(a.a,A6(b));Ty(a)}} -function Yk(a,b,c){var d,e;L8(a.a.a,b)!=null;e=c.Xb();if(e){d=zt(new ot,a,e,a.b);H8(a.f,A6(d.c),d);Rab(a.g,d);a.l.a==a&&mw(a.l,b,d)}else{a.l.a==a&&Ps(a.l,b)}} -function aU(a){YT();var b;b=new hU;b.a=a;!!UT&&(UT.b=b);UT=b;!TT&&(TT=b);if(WT){VT.Zb();return}if(!XT){XT=true;Ny((Jy(),Iy),2,new dU)}} -function Jv(a,b){var c;(DB(),a.d.H).innerText=Utb;c=AI().create(Vtb);c.open(zkb,(Vo(),Qo)+a.f.d+Wtb+a.e+Vgb+Uo);bJ(c.upload,Nv(new Lv,a));ZI(c,Sv(new Qv,a));c.send(b)} -function Tv(b,c){var a,e,f;if(c.status!=200){(DB(),b.a.d.H).innerText=Xtb;jk(b.a.$(),Ytb,true)}(Dv(),Cv).remove(b.a.e);if(c.status==200){try{f=XL(c.responseText);vv(b.a.i,b.a);Yk(b.a.f,b.a,f);return}catch(a){a=PS(a);if(MM(a,23)){e=a;Vo();Uq(br(new sp,Ztb+Fh(e)+hfb+c.responseText))}else throw a}}L8(b.a.f.a.a,b.a)!=null;vv(b.a.i,b.a)} -function ZI(c,a){var b=c;c.onreadystatechange=function(){if(b.readyState==4){$I(a,b);b.onreadystatechange=null;b.onprogress=null;b.upload.onprogress=null}}} -var $tb='%',Wtb='?filename=',eub='AsyncLoader2$1',fub='AsyncLoader2__Callback',dub='AsyncLoader2__Super',aub='AsyncResizer',_tb='Error Resizing image\n',Ztb='Exception on Upload\n',Ttb='Resizing..',Xtb='Upload Error',bub='UploadFile$1',cub='UploadFile$2',Utb='Uploading..',Vtb='beta.httprequest',Otb='end',Ytb='upload-error';_=po.prototype=new Pf;_.gC=to;_.tI=0;_.a=null;_.b=null;_.c=null;_=Lv.prototype=new Pf;_.gC=Pv;_.tI=0;_.a=null;_=Qv.prototype=new Pf;_.gC=Uv;_.tI=0;_.a=null;_=PT.prototype=new Pf;_.gC=RT;_.Zb=ST;_.tI=0;var TT=null,UT=null,VT,WT=false,XT=false;_=dU.prototype=new Pf;_.gC=fU;_.Mb=gU;_.tI=89;_=hU.prototype=new Pf;_.gC=jU;_.tI=0;_.a=null;_.b=null;var ON=B5(yob,aub),CO=B5(yob,bub),DO=B5(yob,cub),XP=B5(urb,dub),VP=B5(urb,eub),WP=B5(urb,fub);Uy(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/1.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/1.cache.js new file mode 100644 index 00000000..e53d53ed --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/1.cache.js @@ -0,0 +1,9 @@ +function ZQ(){} +function WQ(){} +function dR(){} +function VQ(){} +function bR(){return EN} +function YQ(){return DN} +function _Q(){_Q=k9;$Q=new WQ} +function cR(){$Q=(_Q(),new VQ);zx((wx(),vx),1);!!$stats&&$stats(dy(wob,xob,null,null));$Q.Xb();!!$stats&&$stats(dy(wob,yob,null,null))} +var Bob='AsyncLoader1',Aob='AsyncLoader1__Super',wob='runCallbacks1';_=WQ.prototype=new Gf;_.gC=YQ;_.Xb=ZQ;_.tI=0;_=VQ.prototype=new WQ;_.gC=bR;_.Xb=dR;_.tI=0;var $Q;var DN=R1(zob,Aob),EN=R1(zob,Bob);cR(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/2.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/2.cache.js new file mode 100644 index 00000000..b2a4c208 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/2.cache.js @@ -0,0 +1,9 @@ +function iR(){} +function fR(){} +function oR(){} +function eR(){} +function mR(){return GN} +function hR(){return FN} +function kR(){kR=k9;jR=new fR} +function nR(){jR=(kR(),new eR);zx((wx(),vx),2);!!$stats&&$stats(dy(Cob,xob,null,null));jR.Xb();!!$stats&&$stats(dy(Cob,yob,null,null))} +var Eob='AsyncLoader2',Dob='AsyncLoader2__Super',Cob='runCallbacks2';_=fR.prototype=new Gf;_.gC=hR;_.Xb=iR;_.tI=0;_=eR.prototype=new fR;_.gC=mR;_.Xb=oR;_.tI=0;var jR;var FN=R1(zob,Dob),GN=R1(zob,Eob);nR(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/3.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/3.cache.js new file mode 100644 index 00000000..ca33975b --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/0D97DF37194D1924CC80394AAA96B9A3/3.cache.js @@ -0,0 +1,54 @@ +function ux(){} +function Ix(){} +function Sx(){} +function Wx(){} +function ly(){} +function H6(){} +function P6(){} +function Gx(){Bx(vx)} +function Hx(){return CM} +function Rx(){return yM} +function Vx(){return zM} +function $x(){return AM} +function oy(){return BM} +function M6(){return MP} +function S6(){return LP} +function Bx(a){zx(a,a.d)} +function _x(a){Zx(this,a)} +function Nx(a){a.c=0;a.d=0} +function Qx(a){return a.d-a.c} +function N2(){return this.b} +function O6(){return this.c.b.e} +function Ox(a){return a.b[a.c]} +function Mx(a,b){a.b[a.d++]=b} +function Yx(a,b){a.b=b;return a} +function R6(a,b){a.b=b;return a} +function T6(){return k6(this.b.b)} +function Px(a){return a.b[a.c++]} +function L6(a){return Q4(this.b,a)} +function t8(a){if(a.c==0){throw c9(new a9)}} +function J6(a,b,c){a.b=b;a.c=c;return a} +function ny(a,b,c){a.c=b;a.b=c;return a} +function Ux(a,b){kz(a);a.g=Hob+b;return a} +function Lx(a,b){a.b=fK(_P,0,-1,b,1);return a} +function r8(a){var b;t8(a);--a.c;b=a.b.b;N8(b);return b.d} +function U6(){var a;a=vK(l6(this.b.b),61).nc();return a} +function N6(){var a;a=v5(new t5,this.c.b);return R6(new P6,a)} +function D4(a){var b;b=l5(new e5,a);return J6(new H6,a,b)} +function Dx(a,b,c,d){!!$stats&&$stats(dy(a,b,c,d))} +function jy(b,c){function d(a){c.Hb(a)} +return __gwtStartLoadingFragment(b,d)} +function Q4(a,b){if(a.d&&V7(a.c,b)){return true}else if(P4(a,b)){return true}else if(N4(a,b)){return true}return false} +function yx(a,b,c){wx();a.b=T7(new R7);a.g=n8(new l8);a.d=b;a.c=c;a.f=Lx(new Ix,b+1);return a} +function wx(){wx=k9;vx=yx(new ux,3,gK(_P,0,-1,[]))} +function ky(a,b){var c,d;c=jy(a,b);if(c==null){return}d=u1();d.open(wgb,c,true);s1(d,ny(new ly,d,b));d.send(null)} +function Ax(a,b){var c,d,e,f;if(b==a.d){return true}for(d=a.c,e=0,f=d.length;e0){e7(h,vK(r8(b.b.g),41));Px(b.b.f)}Nx(b.b.f);g7(h,D4(b.b.b));M4(b.b.b);i=null;for(g=j6(new g6,h);g.b1){return}if(Qx(a.e)>0){c=Ox(a.e);Dx(c==a.d?Fob:Gob+c,xob,Q2(c),null);ky(c,Yx(new Wx,a));return}while(Qx(a.f)>0){c=Px(a.f);b=vK(r8(a.g),41);Dx(c==a.d?Fob:Gob+c,xob,Q2(c),null);ky(c,b)}} +var Pob='AbstractMap$2',Qob='AbstractMap$2$1',Kob='AsyncFragmentLoader',Lob='AsyncFragmentLoader$BoundedIntQueue',Mob='AsyncFragmentLoader$HttpDownloadFailure',Nob='AsyncFragmentLoader$InitialFragmentDownloadFailed',Oob='AsyncFragmentLoader$XhrLoadingStrategy$1',Hob='HTTP download failed with status ',Job='[I',xob='begin',zob='com.google.gwt.lang.asyncloaders.',Gob='download',yob='end',Fob='leftoversDownload',Iob='runAsync';_=ux.prototype=new Gf;_.gC=Hx;_.tI=0;_.c=null;_.d=0;_.e=null;_.f=null;var vx;_=Ix.prototype=new Gf;_.gC=Rx;_.tI=0;_.b=null;_.c=0;_.d=0;_=Sx.prototype=new rw;_.gC=Vx;_.tI=76;_=Wx.prototype=new Gf;_.gC=$x;_.Hb=_x;_.tI=77;_.b=null;_=ly.prototype=new Gf;_.gC=oy;_.Ib=py;_.tI=0;_.b=null;_.c=null;_=F2.prototype;_.gc=N2;_=H6.prototype=new o4;_.ic=L6;_.gC=M6;_.ob=N6;_.jc=O6;_.tI=0;_.b=null;_.c=null;_=P6.prototype=new Gf;_.gC=S6;_.Yb=T6;_.Zb=U6;_.tI=0;_.b=null;var _P=Q1(nbb,Job),CM=R1(clb,Kob),yM=R1(clb,Lob),zM=R1(clb,Mob),AM=R1(clb,Nob),BM=R1(clb,Oob),MP=R1(djb,Pob),LP=R1(djb,Qob);Gx(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/1.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/1.cache.js new file mode 100644 index 00000000..d583bce7 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/1.cache.js @@ -0,0 +1,9 @@ +function SQ(){} +function PQ(){} +function YQ(){} +function OQ(){} +function WQ(){return yN} +function RQ(){return xN} +function UQ(){UQ=i9;TQ=new PQ} +function XQ(){TQ=(UQ(),new OQ);Bx((yx(),xx),1);!!$stats&&$stats(fy(xob,yob,null,null));TQ.Vb();!!$stats&&$stats(fy(xob,zob,null,null))} +var Cob='AsyncLoader1',Bob='AsyncLoader1__Super',xob='runCallbacks1';_=PQ.prototype=new Ef;_.gC=RQ;_.Vb=SQ;_.tI=0;_=OQ.prototype=new PQ;_.gC=WQ;_.Vb=YQ;_.tI=0;var TQ;var xN=P1(Aob,Bob),yN=P1(Aob,Cob);XQ(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/2.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/2.cache.js new file mode 100644 index 00000000..7bb8a12e --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/2.cache.js @@ -0,0 +1,9 @@ +function bR(){} +function $Q(){} +function hR(){} +function ZQ(){} +function fR(){return AN} +function aR(){return zN} +function dR(){dR=i9;cR=new $Q} +function gR(){cR=(dR(),new ZQ);Bx((yx(),xx),2);!!$stats&&$stats(fy(Dob,yob,null,null));cR.Vb();!!$stats&&$stats(fy(Dob,zob,null,null))} +var Fob='AsyncLoader2',Eob='AsyncLoader2__Super',Dob='runCallbacks2';_=$Q.prototype=new Ef;_.gC=aR;_.Vb=bR;_.tI=0;_=ZQ.prototype=new $Q;_.gC=fR;_.Vb=hR;_.tI=0;var cR;var zN=P1(Aob,Eob),AN=P1(Aob,Fob);gR(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/3.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/3.cache.js new file mode 100644 index 00000000..8e8f02c9 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/27AC86F0820D8F960DBF73C151C0332B/3.cache.js @@ -0,0 +1,54 @@ +function wx(){} +function Kx(){} +function Ux(){} +function Yx(){} +function ny(){} +function F6(){} +function N6(){} +function Ix(){Dx(xx)} +function Jx(){return yM} +function Tx(){return uM} +function Xx(){return vM} +function ay(){return wM} +function qy(){return xM} +function K6(){return FP} +function Q6(){return EP} +function Dx(a){Bx(a,a.d)} +function by(a){_x(this,a)} +function Px(a){a.c=0;a.d=0} +function Sx(a){return a.d-a.c} +function L2(){return this.b} +function M6(){return this.c.b.e} +function Qx(a){return a.b[a.c]} +function Ox(a,b){a.b[a.d++]=b} +function $x(a,b){a.b=b;return a} +function P6(a,b){a.b=b;return a} +function R6(){return i6(this.b.b)} +function Rx(a){return a.b[a.c++]} +function J6(a){return O4(this.b,a)} +function r8(a){if(a.c==0){throw a9(new $8)}} +function H6(a,b,c){a.b=b;a.c=c;return a} +function py(a,b,c){a.c=b;a.b=c;return a} +function Wx(a,b){mz(a);a.g=Iob+b;return a} +function Nx(a,b){a.b=aK(UP,0,-1,b,1);return a} +function Fx(a,b,c,d){!!$stats&&$stats(fy(a,b,c,d))} +function ly(b,c){function d(a){c.Jb(a)} +return __gwtStartLoadingFragment(b,d)} +function p8(a){var b;r8(a);--a.c;b=a.b.b;L8(b);return b.d} +function S6(){var a;a=qK(j6(this.b.b),61).lc();return a} +function B4(a){var b;b=j5(new c5,a);return H6(new F6,a,b)} +function L6(){var a;a=t5(new r5,this.c.b);return P6(new N6,a)} +function yx(){yx=i9;xx=Ax(new wx,3,bK(UP,0,-1,[]))} +function Bx(a,b){var c;c=b==a.d?Gob:Hob+b;Fx(c,zob,O2(b),null);if(Cx(a,b)){Rx(a.e);Y4(a.b,O2(b));Hx(a)}} +function my(a,b){var c,d;c=ly(a,b);if(c==null){return}d=s1();d.open(vgb,c,true);q1(d,py(new ny,d,b));d.send(null)} +function Cx(a,b){var c,d,e,f;if(b==a.d){return true}for(d=a.c,e=0,f=d.length;e1){return}if(Sx(a.e)>0){c=Qx(a.e);Fx(c==a.d?Gob:Hob+c,yob,O2(c),null);my(c,$x(new Yx,a));return}while(Sx(a.f)>0){c=Rx(a.f);b=qK(p8(a.g),41);Fx(c==a.d?Gob:Hob+c,yob,O2(c),null);my(c,b)}} +function _x(b,c){var a,e,f,g,h,i;h=b7(new $6);while(Sx(b.b.f)>0){c7(h,qK(p8(b.b.g),41));Rx(b.b.f)}Px(b.b.f);e7(h,B4(b.b.b));K4(b.b.b);i=null;for(g=h6(new e6,h);g.bb){if(f>1){e.resize(a.c.c,~~Math.max(Math.min(c/f,2147483647),-2147483648));Hv(a.d,e.encode());return}Hv(a.d,a.b)}else{if(b>1){e.resize(~~Math.max(Math.min(d/b,2147483647),-2147483648),a.c.b);Hv(a.d,e.encode());return}Hv(a.d,a.b)}} -var vrb='AsyncLoader2',trb='beta.canvas',urb='runCallbacks2';_=lT.prototype=new mT;_.gC=xT;_.$b=BT;_.tI=0;var DP=T3(gpb,vrb);yT(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/3295227D4A416F64C8B3061D11DFABA0/3.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/3295227D4A416F64C8B3061D11DFABA0/3.cache.js deleted file mode 100644 index bd1e277b..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/3295227D4A416F64C8B3061D11DFABA0/3.cache.js +++ /dev/null @@ -1,35 +0,0 @@ -function no(){} -function Jv(){} -function Ov(){} -function pT(){} -function mT(){} -function CT(){} -function GT(){} -function Oy(){Jy(Cy)} -function ro(){return rN} -function Nv(){return fO} -function Sv(){return gO} -function oT(){return CP} -function ET(){return AP} -function IT(){return BP} -function Jy(a){Gy(a,a.e)} -function Lv(a,b){a.b=b;return a} -function Qv(a,b){a.b=b;return a} -function vT(){vT=qbb;sT=new mT} -function FT(a){vT();uT=false;AT(a)} -function CI(a,b){if(!a){return}Rv(a,b)} -function FI(c,b){c.onprogress=function(a){GI(b,a)}} -function po(a,b,c){a.b=b;a.d=c;a.c=c.i;return a} -function kw(a,b,c){var d;d=W1(a.g,b);Ms(a,c,a.I,d,true);Ns(a,b)} -function tv(a,b){d7(a.g.b,b)!=null;xv(a);wv(a);bt(a.b.e)} -function Gv(a){if(a.i.d){bC((GB(),a.e.I),wrb);zT(po(new no,a.b,a))}else{Hv(a,a.b)}} -function wv(a){var b;if(a.f.c>0){b=lM(xab(a.f),37);Gv(b)}else{a.e=false}} -function GI(a,b){var c;if(!a){return}c=b.loaded/b.total;a.b.h.b.bb(yM(Math.floor(c*100))+Drb)} -function Gy(a,b){var c;c=b==a.e?zib:Aib+b;Ly(c,rrb,S4(b),null);if(Iy(a,b)){Xy(a.f);d7(a.b,S4(b));Ny(a)}} -function Hv(a,b){var c;bC((GB(),a.e.I),xrb);c=cI().create(yrb);c.open(bjb,(To(),Oo)+a.g.e+zrb+a.f+sfb+So);FI(c.upload,Lv(new Jv,a));BI(c,Qv(new Ov,a));c.send(b)} -function AT(a){vT();while(qT){To();Sq(_q(new qp,Erb+Ah(a)));qT=qT.c}rT=null} -function zT(a){vT();var b;b=new GT;b.b=a;!!rT&&(rT.c=b);rT=b;!qT&&(qT=b);if(tT){sT.$b();return}if(!uT){uT=true;Hy((Dy(),Cy),2,new CT)}} -function Wk(a,b,c){var d,e;d7(a.b.b,b)!=null;e=c.Yb();if(e){d=xt(new mt,a,e,a.c);_6(a.g,S4(d.d),d);j9(a.h,d);a.m.b==a&&kw(a.m,b,d)}else{a.m.b==a&&Ns(a.m,b)}} -function Rv(b,c){var a,e,f;if(c.status!=200){bC((GB(),b.b.e.I),Arb);hk(b.b._(),Brb,true)}(Bv(),Av).remove(b.b.f);if(c.status==200){try{f=zL(c.responseText);tv(b.b.j,b.b);Wk(b.b.g,b.b,f);return}catch(a){a=mS(a);if(oM(a,23)){e=a;To();Sq(_q(new qp,Crb+Ah(e)+Idb+c.responseText))}else throw a}}d7(b.b.g.b.b,b.b)!=null;tv(b.b.j,b.b)} -function BI(c,a){var b=c;c.onreadystatechange=function(){if(b.readyState==4){CI(a,b);b.onreadystatechange=null;b.onprogress=null;b.upload.onprogress=null}}} -var Drb='%',zrb='?filename=',Jrb='AsyncLoader2$1',Krb='AsyncLoader2__Callback',Irb='AsyncLoader2__Super',Frb='AsyncResizer',Erb='Error Resizing image\n',Crb='Exception on Upload\n',wrb='Resizing..',Arb='Upload Error',Grb='UploadFile$1',Hrb='UploadFile$2',xrb='Uploading..',yrb='beta.httprequest',rrb='end',Brb='upload-error';_=no.prototype=new Kf;_.gC=ro;_.tI=0;_.b=null;_.c=null;_.d=null;_=Jv.prototype=new Kf;_.gC=Nv;_.tI=0;_.b=null;_=Ov.prototype=new Kf;_.gC=Sv;_.tI=0;_.b=null;_=mT.prototype=new Kf;_.gC=oT;_.$b=pT;_.tI=0;var qT=null,rT=null,sT,tT=false,uT=false;_=CT.prototype=new Kf;_.gC=ET;_.Nb=FT;_.tI=89;_=GT.prototype=new Kf;_.gC=IT;_.tI=0;_.b=null;_.c=null;var rN=T3(imb,Frb),fO=T3(imb,Grb),gO=T3(imb,Hrb),CP=T3(gpb,Irb),AP=T3(gpb,Jrb),BP=T3(gpb,Krb);Oy(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/371B2293E0881C8A53FDA41CA333A843/1.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/371B2293E0881C8A53FDA41CA333A843/1.cache.js deleted file mode 100644 index 537c3947..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/371B2293E0881C8A53FDA41CA333A843/1.cache.js +++ /dev/null @@ -1,7 +0,0 @@ -function SS(){} -function cT(){return BP} -function gT(){var a;while(XS){a=XS;XS=XS.c;!XS&&(YS=null);Yv(a.b.b)}} -function xv(a,b){Jab(a.f,b);if(!a.e){a.e=true;yv(a)}a.c=false;zv(a)} -function Yv(a){var b;a.b.b=a.b.c.blob;(Dv(),Cv).captureBlob(a.b.b,a.b.f,Hrb);b=V$(new S$,a.b.f);a.b.d.sb(b);xv(a.b.j,a.b)} -function dT(){$S=true;ZS=(aT(),new SS);Iy((Fy(),Ey),1);!!$stats&&$stats(mz(Irb,Pib,null,null));ZS.Zb();!!$stats&&$stats(mz(Irb,Jrb,null,null))} -var Krb='AsyncLoader1',Hrb='image/JPEG',Irb='runCallbacks1';_=SS.prototype=new TS;_.gC=cT;_.Zb=gT;_.tI=0;var BP=g4(xpb,Krb);dT(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/371B2293E0881C8A53FDA41CA333A843/2.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/371B2293E0881C8A53FDA41CA333A843/2.cache.js deleted file mode 100644 index 45b26939..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/371B2293E0881C8A53FDA41CA333A843/2.cache.js +++ /dev/null @@ -1,6 +0,0 @@ -function oT(){} -function AT(){return FP} -function ET(){var a;while(tT){a=tT;tT=tT.c;!tT&&(uT=null);ro(a.b)}} -function BT(){wT=true;vT=(yT(),new oT);Iy((Fy(),Ey),2);!!$stats&&$stats(mz(Mrb,Pib,null,null));vT.Zb();!!$stats&&$stats(mz(Mrb,Jrb,null,null))} -function ro(a){var b,c,d,e,f;e=($wnd.google&&$wnd.google.gears&&$wnd.google.gears.factory).create(Lrb);e.decode(a.b);d=e.width;c=e.height;f=d/a.c.c;b=c/a.c.b;if(f>b){if(f>1){e.resize(a.c.c,~~Math.max(Math.min(c/f,2147483647),-2147483648));Jv(a.d,e.encode());return}Jv(a.d,a.b)}else{if(b>1){e.resize(~~Math.max(Math.min(d/b,2147483647),-2147483648),a.c.b);Jv(a.d,e.encode());return}Jv(a.d,a.b)}} -var Nrb='AsyncLoader2',Lrb='beta.canvas',Mrb='runCallbacks2';_=oT.prototype=new pT;_.gC=AT;_.Zb=ET;_.tI=0;var FP=g4(xpb,Nrb);BT(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/371B2293E0881C8A53FDA41CA333A843/3.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/371B2293E0881C8A53FDA41CA333A843/3.cache.js deleted file mode 100644 index 32d9894a..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/371B2293E0881C8A53FDA41CA333A843/3.cache.js +++ /dev/null @@ -1,35 +0,0 @@ -function oo(){} -function Lv(){} -function Qv(){} -function sT(){} -function pT(){} -function FT(){} -function JT(){} -function Qy(){Ly(Ey)} -function so(){return tN} -function Pv(){return hO} -function Uv(){return iO} -function rT(){return EP} -function HT(){return CP} -function LT(){return DP} -function Ly(a){Iy(a,a.e)} -function Nv(a,b){a.b=b;return a} -function Sv(a,b){a.b=b;return a} -function yT(){yT=Ebb;vT=new pT} -function IT(a){yT();xT=false;DT(a)} -function EI(a,b){if(!a){return}Tv(a,b)} -function vv(a,b){r7(a.g.b,b)!=null;zv(a);yv(a);dt(a.b.e)} -function Iv(a){if(a.i.d){(DB(),a.e.I).textContent=Orb;CT(qo(new oo,a.b,a))}else{Jv(a,a.b)}} -function mw(a,b,c){var d;d=$1(a.g,b);Os(a,c,a.I,d,true);Ps(a,b)} -function HI(c,b){c.onprogress=function(a){II(b,a)}} -function qo(a,b,c){a.b=b;a.d=c;a.c=c.i;return a} -function DT(a){yT();while(tT){Uo();Uq(br(new rp,Wrb+Bh(a)));tT=tT.c}uT=null} -function II(a,b){var c;if(!a){return}c=b.loaded/b.total;a.b.h.b.bb(AM(Math.floor(c*100))+Vrb)} -function Iy(a,b){var c;c=b==a.e?Nib:Oib+b;Ny(c,Jrb,f5(b),null);if(Ky(a,b)){Zy(a.f);r7(a.b,f5(b));Py(a)}} -function yv(a){var b;if(a.f.c>0){b=nM(Lab(a.f),37);Iv(b)}else{a.e=false}} -function CT(a){yT();var b;b=new JT;b.b=a;!!uT&&(uT.c=b);uT=b;!tT&&(tT=b);if(wT){vT.Zb();return}if(!xT){xT=true;Jy((Fy(),Ey),2,new FT)}} -function Xk(a,b,c){var d,e;r7(a.b.b,b)!=null;e=c.Xb();if(e){d=zt(new ot,a,e,a.c);n7(a.g,f5(d.d),d);x9(a.h,d);a.m.b==a&&mw(a.m,b,d)}else{a.m.b==a&&Ps(a.m,b)}} -function Tv(b,c){var a,e,f;if(c.status!=200){(DB(),b.b.e.I).textContent=Srb;ik(b.b._(),Trb,true)}(Dv(),Cv).remove(b.b.f);if(c.status==200){try{f=BL(c.responseText);vv(b.b.j,b.b);Xk(b.b.g,b.b,f);return}catch(a){a=pS(a);if(qM(a,23)){e=a;Uo();Uq(br(new rp,Urb+Bh(e)+Wdb+c.responseText))}else throw a}}r7(b.b.g.b.b,b.b)!=null;vv(b.b.j,b.b)} -function DI(c,a){var b=c;c.onreadystatechange=function(){if(b.readyState==4){EI(a,b);b.onreadystatechange=null;b.onprogress=null;b.upload.onprogress=null}}} -function Jv(a,b){var c;(DB(),a.e.I).textContent=Prb;c=eI().create(Qrb);c.open(pjb,(Uo(),Po)+a.g.e+Rrb+a.f+Gfb+To);HI(c.upload,Nv(new Lv,a));DI(c,Sv(new Qv,a));c.send(b)} -var Vrb='%',Rrb='?filename=',_rb='AsyncLoader2$1',asb='AsyncLoader2__Callback',$rb='AsyncLoader2__Super',Xrb='AsyncResizer',Wrb='Error Resizing image\n',Urb='Exception on Upload\n',Orb='Resizing..',Srb='Upload Error',Yrb='UploadFile$1',Zrb='UploadFile$2',Prb='Uploading..',Qrb='beta.httprequest',Jrb='end',Trb='upload-error';_=oo.prototype=new Lf;_.gC=so;_.tI=0;_.b=null;_.c=null;_.d=null;_=Lv.prototype=new Lf;_.gC=Pv;_.tI=0;_.b=null;_=Qv.prototype=new Lf;_.gC=Uv;_.tI=0;_.b=null;_=pT.prototype=new Lf;_.gC=rT;_.Zb=sT;_.tI=0;var tT=null,uT=null,vT,wT=false,xT=false;_=FT.prototype=new Lf;_.gC=HT;_.Nb=IT;_.tI=89;_=JT.prototype=new Lf;_.gC=LT;_.tI=0;_.b=null;_.c=null;var tN=g4(zmb,Xrb),hO=g4(zmb,Yrb),iO=g4(zmb,Zrb),EP=g4(xpb,$rb),CP=g4(xpb,_rb),DP=g4(xpb,asb);Qy(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/46E36699DD51342BCC1877A718D3B6D5/1.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/46E36699DD51342BCC1877A718D3B6D5/1.cache.js deleted file mode 100644 index c90129c8..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/46E36699DD51342BCC1877A718D3B6D5/1.cache.js +++ /dev/null @@ -1,7 +0,0 @@ -function jh(){} -function hh(){} -function oh(){} -function gh(){} -function lh(){lh=Ap;kh=new hh} -function nh(){kh=(lh(),new gh);ac((Zb(),Yb),1);!!$stats&&$stats(Cc(Lr,Mr,null,null));kh.q();!!$stats&&$stats(Cc(Lr,Nr,null,null))} -var Lr='runCallbacks1';_=hh.prototype=new O;_.q=jh;_.tI=0;_=gh.prototype=new hh;_.q=oh;_.tI=0;var kh;nh(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/46E36699DD51342BCC1877A718D3B6D5/2.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/46E36699DD51342BCC1877A718D3B6D5/2.cache.js deleted file mode 100644 index 5cfc3a62..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/46E36699DD51342BCC1877A718D3B6D5/2.cache.js +++ /dev/null @@ -1,7 +0,0 @@ -function sh(){} -function qh(){} -function xh(){} -function ph(){} -function uh(){uh=Ap;th=new qh} -function wh(){th=(uh(),new ph);ac((Zb(),Yb),2);!!$stats&&$stats(Cc(Or,Mr,null,null));th.q();!!$stats&&$stats(Cc(Or,Nr,null,null))} -var Or='runCallbacks2';_=qh.prototype=new O;_.q=sh;_.tI=0;_=ph.prototype=new qh;_.q=xh;_.tI=0;var th;wh(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/46E36699DD51342BCC1877A718D3B6D5/3.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/46E36699DD51342BCC1877A718D3B6D5/3.cache.js deleted file mode 100644 index ba18aa58..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/46E36699DD51342BCC1877A718D3B6D5/3.cache.js +++ /dev/null @@ -1,75 +0,0 @@ -function Xb(){} -function ic(){} -function rc(){} -function uc(){} -function Kc(){} -function Rk(){} -function Qk(){} -function Gn(){} -function Nn(){} -function Sn(){} -function Io(){} -function To(){} -function ap(){} -function hc(){cc(Yb)} -function cc(a){ac(a,a.d)} -function yc(a){xc(this,a)} -function nc(a){a.c=0;a.d=0} -function qc(a){return a.d-a.c} -function Wk(){return this.b} -function Xk(){return this.b} -function So(){return this.c} -function _o(){return Zo(this)} -function oc(a){return a.b[a.c]} -function mc(a,b){a.b[a.d++]=b} -function tc(a,b){Ed();return a} -function wc(a,b){a.b=b;return a} -function Uk(a,b){a.b=b;return a} -function Pn(a,b){a.b=b;return a} -function Wn(){return No(this,0)} -function Mn(){return this.c.b.e} -function pc(a){return a.b[a.c++]} -function Qn(){return nn(this.b.b)} -function Kn(a){return am(this.b,a)} -function $o(){return this.c!=this.e.b} -function Qo(a){if(a.c==0){throw tp(new rp)}} -function cp(a){a.b=a.c=a;return a} -function Mc(a,b,c){a.c=b;a.b=c;return a} -function In(a,b,c){a.b=b;a.c=c;return a} -function Ro(a){return dp(new ap,a,this.b),++this.c,true} -function Mo(a,b,c){dp(new ap,b,c);++a.c} -function Ko(a){a.b=cp(new ap);a.c=0;return a} -function Wo(a,b,c,d){a.e=d;a.c=c;a.b=b;return a} -function dp(a,b,c){a.d=b;a.b=c;a.c=c.c;c.c.b=a;c.c=a;return a} -function lc(a,b){a.b=ig(Mg,0,-1,b,1);return a} -function _k(){_k=Ap;$k=ig(Og,0,12,256,0)} -function Rn(){var a;a=yg(on(this.b.b),20).H();return a} -function Ln(){var a;a=Em(new Cm,this.c.b);return Pn(new Nn,a)} -function Sl(a){var b;b=vm(new pm,a);return In(new Gn,a,b)} -function Zb(){Zb=Ap;Yb=_b(new Xb,3,jg(Mg,0,-1,[]))} -function ec(a,b,c,d){!!$stats&&$stats(Cc(a,b,c,d))} -function Ic(b,c){function d(a){c.i(a)} -return __gwtStartLoadingFragment(b,d)} -function Un(a,b){var c;c=No(this,a);Mo(c.e,b,c.c);++c.b;c.d=null} -function Oo(a){var b;Qo(a);--a.c;b=a.b.b;b.b.c=b.c;b.c.b=b.b;b.b=b.c=b;return b.d} -function uk(c,a){var b=c;c.onreadystatechange=$entry(function(){a.j(b)})} -function ok(b){var a=b;$wnd.setTimeout(function(){a.onreadystatechange=new Function},0)} -function Vn(b){var a,d;d=No(this,b);try{return Zo(d)}catch(a){a=Yg(a);if(Bg(a,23)){throw Pk(new Mk,Vr+b)}else throw a}} -function Zo(a){if(a.c==a.e.b){throw tp(new rp)}a.d=a.c;a.c=a.c.b;++a.b;return a.d.d} -function _b(a,b,c){Zb();a.b=to(new ro);a.g=Ko(new Io);a.d=b;a.c=c;a.f=lc(new ic,b+1);return a} -function am(a,b){if(a.d&&uo(a.c,b)){return true}else if(_l(a,b)){return true}else if(Zl(a,b)){return true}return false} -function ac(a,b){var c;c=b==a.d?Pr:Qr+b;ec(c,Nr,Yk(b),null);if(bc(a,b)){pc(a.e);km(a.b,Yk(b));gc(a)}} -function Jc(a,b){var c,d;c=Ic(a,b);if(c==null){return}d=vk();d.open(Sr,c,true);uk(d,Mc(new Kc,d,b));d.send(null)} -function bc(a,b){var c,d,e,f;if(b==a.d){return true}for(d=a.c,e=0,f=d.length;e-129&&a<128){b=a+128;c=(_k(),$k)[b];!c&&(c=$k[b]=Uk(new Qk,a));return c}return Uk(new Qk,a)} -function _l(e,a){var b=e.f;for(var c in b){if(c.charCodeAt(0)==58){var d=b[c];if(e.F(a,d)){return true}}}return false} -function Zl(i,a){var b=i.b;for(var c in b){if(c==parseInt(c)){var d=b[c];for(var e=0,f=d.length;e0){_n(h,yg(Oo(b.b.g),2));pc(b.b.f)}nc(b.b.f);bo(h,Sl(b.b.b));Yl(b.b.b);i=null;for(g=mn(new jn,h);g.b1){return}if(qc(a.e)>0){c=oc(a.e);ec(c==a.d?Pr:Qr+c,Mr,Yk(c),null);Jc(c,wc(new uc,a));return}while(qc(a.f)>0){c=pc(a.f);b=yg(Oo(a.g),2);ec(c==a.d?Pr:Qr+c,Mr,Yk(c),null);Jc(c,b)}} -function No(a,b){var c,d;(b<0||b>a.c)&&gn(b,a.c);if(b>=a.c>>1){d=a.b;for(c=a.c;c>b;--c){d=d.c}}else{d=a.b.b;for(c=0;cb){if(f>1){e.resize(a.c.c,~~Math.max(Math.min(c/f,2147483647),-2147483648));vw(a.d,e.encode());return}vw(a.d,a.b)}else{if(b>1){e.resize(~~Math.max(Math.min(d/b,2147483647),-2147483648),a.c.b);vw(a.d,e.encode());return}vw(a.d,a.b)}} +var Etb='AsyncLoader2',Ctb='beta.canvas',Dtb='runCallbacks2';_=QU.prototype=new RU;_.gC=aV;_.Zb=eV;_.tI=0;var fR=J5(orb,Etb);bV(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/3.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/3.cache.js new file mode 100644 index 00000000..4481e97b --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/4AFE598FDFDF189DD61F57E554328B10/3.cache.js @@ -0,0 +1,35 @@ +function zo(){} +function xw(){} +function Cw(){} +function UU(){} +function RU(){} +function fV(){} +function jV(){} +function gA(){bA(Wz)} +function Do(){return KO} +function Bw(){return DP} +function Gw(){return EP} +function TU(){return eR} +function hV(){return cR} +function lV(){return dR} +function bA(a){$z(a,a.e)} +function zw(a,b){a.b=b;return a} +function Ew(a,b){a.b=b;return a} +function $U(){$U=edb;XU=new RU} +function iV(a){$U();ZU=false;dV(a)} +function VJ(a,b){if(!a){return}Fw(a,b)} +function YJ(c,b){c.onprogress=function(a){ZJ(b,a)}} +function Bo(a,b,c){a.b=b;a.d=c;a.c=c.i;return a} +function _w(a,b,c){var d;d=B3(a.g,b);ut(a,c,a.I,d,true);vt(a,b)} +function gw(a,b){T8(a.g.b,b)!=null;lw(a);kw(a);Lt(a.b.f)} +function uw(a){if(a.i.d){(UC(),a.e.I).textContent=Ftb;cV(Bo(new zo,a.b,a))}else{vw(a,a.b)}} +function dV(a){$U();while(VU){dr();jq(Fr(new Dr,Otb+Mh(a)));VU=VU.c}WU=null} +function ZJ(a,b){var c;if(!a){return}c=b.loaded/b.total;a.b.h.b.bb(RN(Math.floor(c*100))+Ntb)} +function $z(a,b){var c;c=b==a.e?tkb:ukb+b;dA(c,Atb,I6(b),null);if(aA(a,b)){pA(a.f);T8(a.b,I6(b));fA(a)}} +function kw(a){var b;if(a.f.c>0){b=EN(lcb(a.f),37);uw(b)}else{a.e=false}} +function cV(a){$U();var b;b=new jV;b.b=a;!!WU&&(WU.c=b);WU=b;!VU&&(VU=b);if(YU){XU.Zb();return}if(!ZU){ZU=true;_z((Xz(),Wz),2,new fV)}} +function gl(a,b,c){var d,e;T8(a.b.b,b)!=null;e=c.Xb();if(e){d=fu(new Wt,a,e,a.c);P8(a.g,I6(d.d),d);Zab(a.h,d);a.m.b==a&&_w(a.m,b,d)}else{a.m.b==a&&vt(a.m,b)}} +function Fw(b,c){var a,e,f;if(c.status!=200){(UC(),b.b.e.I).textContent=Jtb;tk(b.b._(),Ktb,true);dr();jq(Fr(new Dr,Ltb+c.responseText))}(pw(),ow).remove(b.b.f);if(c.status==200){try{f=SM(c.responseText);gw(b.b.j,b.b);gl(b.b.g,b.b,f);return}catch(a){a=RT(a);if(HN(a,23)){e=a;dr();jq(Fr(new Dr,Mtb+Mh(e)+wfb+c.responseText))}else throw a}}T8(b.b.g.b.b,b.b)!=null;gw(b.b.j,b.b)} +function UJ(c,a){var b=c;c.onreadystatechange=function(){if(b.readyState==4){VJ(a,b);b.onreadystatechange=null;b.onprogress=null;b.upload.onprogress=null}}} +function vw(a,b){var c;(UC(),a.e.I).textContent=Gtb;c=vJ().create(Htb);c.open(Xkb,(dr(),$q)+a.g.e+Itb+a.f+yhb+cr);YJ(c.upload,zw(new xw,a));UJ(c,Ew(new Cw,a));c.send(b)} +var Ntb='%',Itb='?filename=',Ttb='AsyncLoader2$1',Utb='AsyncLoader2__Callback',Stb='AsyncLoader2__Super',Ptb='AsyncResizer',Otb='Error Resizing image\n',Ltb='Error Uploading\n',Mtb='Exception on Upload\n',Ftb='Resizing..',Jtb='Upload Error',Qtb='UploadFile$1',Rtb='UploadFile$2',Gtb='Uploading..',Htb='beta.httprequest',Atb='end',Ktb='upload-error';_=zo.prototype=new Wf;_.gC=Do;_.tI=0;_.b=null;_.c=null;_.d=null;_=xw.prototype=new Wf;_.gC=Bw;_.tI=0;_.b=null;_=Cw.prototype=new Wf;_.gC=Gw;_.tI=0;_.b=null;_=RU.prototype=new Wf;_.gC=TU;_.Zb=UU;_.tI=0;var VU=null,WU=null,XU,YU=false,ZU=false;_=fV.prototype=new Wf;_.gC=hV;_.Nb=iV;_.tI=95;_=jV.prototype=new Wf;_.gC=lV;_.tI=0;_.b=null;_.c=null;var KO=J5(fob,Ptb),DP=J5(fob,Qtb),EP=J5(fob,Rtb),eR=J5(orb,Stb),cR=J5(orb,Ttb),dR=J5(orb,Utb);gA(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/1.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/1.cache.js new file mode 100644 index 00000000..3a44f42f --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/1.cache.js @@ -0,0 +1,7 @@ +function pU(){} +function BU(){return _Q} +function FU(){var a;while(uU){a=uU;uU=uU.c;!uU&&(vU=null);Iw(a.b.b)}} +function gw(a,b){Xbb(a.f,b);if(!a.e){a.e=true;iw(a)}a.c=false;jw(a)} +function Iw(a){var b;a.b.b=a.b.c.blob;(nw(),mw).captureBlob(a.b.b,a.b.f,gtb);b=s0(new p0,a.b.f);a.b.d.sb(b);gw(a.b.j,a.b)} +function CU(){xU=true;wU=(zU(),new pU);Yz((Vz(),Uz),1);!!$stats&&$stats(CA(htb,hkb,null,null));wU.$b();!!$stats&&$stats(CA(htb,itb,null,null))} +var jtb='AsyncLoader1',gtb='image/JPEG',htb='runCallbacks1';_=pU.prototype=new qU;_.gC=BU;_.$b=FU;_.tI=0;var _Q=u5(Zqb,jtb);CU(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/2.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/2.cache.js new file mode 100644 index 00000000..7b5a86ac --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/2.cache.js @@ -0,0 +1,6 @@ +function NU(){} +function ZU(){return dR} +function bV(){var a;while(SU){a=SU;SU=SU.c;!SU&&(TU=null);Bo(a.b)}} +function $U(){VU=true;UU=(XU(),new NU);Yz((Vz(),Uz),2);!!$stats&&$stats(CA(ltb,hkb,null,null));UU.$b();!!$stats&&$stats(CA(ltb,itb,null,null))} +function Bo(a){var b,c,d,e,f;e=($wnd.google&&$wnd.google.gears&&$wnd.google.gears.factory).create(ktb);e.decode(a.b);d=e.width;c=e.height;f=d/a.c.c;b=c/a.c.b;if(f>b){if(f>1){e.resize(a.c.c,~~Math.max(Math.min(c/f,2147483647),-2147483648));tw(a.d,e.encode());return}tw(a.d,a.b)}else{if(b>1){e.resize(~~Math.max(Math.min(d/b,2147483647),-2147483648),a.c.b);tw(a.d,e.encode());return}tw(a.d,a.b)}} +var mtb='AsyncLoader2',ktb='beta.canvas',ltb='runCallbacks2';_=NU.prototype=new OU;_.gC=ZU;_.$b=bV;_.tI=0;var dR=u5(Zqb,mtb);$U(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/3.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/3.cache.js new file mode 100644 index 00000000..96fe591c --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/4E8EC2279CB4B46228EFF0682ED166A4/3.cache.js @@ -0,0 +1,35 @@ +function yo(){} +function vw(){} +function Aw(){} +function RU(){} +function OU(){} +function cV(){} +function gV(){} +function eA(){_z(Uz)} +function Co(){return IO} +function zw(){return BP} +function Ew(){return CP} +function QU(){return cR} +function eV(){return aR} +function iV(){return bR} +function _z(a){Yz(a,a.e)} +function xw(a,b){a.b=b;return a} +function Cw(a,b){a.b=b;return a} +function XU(){XU=Scb;UU=new OU} +function fV(a){XU();WU=false;aV(a)} +function TJ(a,b){if(!a){return}Dw(a,b)} +function WJ(c,b){c.onprogress=function(a){XJ(b,a)}} +function Ao(a,b,c){a.b=b;a.d=c;a.c=c.i;return a} +function Zw(a,b,c){var d;d=x3(a.g,b);st(a,c,a.I,d,true);tt(a,b)} +function ew(a,b){F8(a.g.b,b)!=null;jw(a);iw(a);Jt(a.b.f)} +function sw(a){if(a.i.d){sD((XC(),a.e.I),ntb);_U(Ao(new yo,a.b,a))}else{tw(a,a.b)}} +function iw(a){var b;if(a.f.c>0){b=CN(Zbb(a.f),37);sw(b)}else{a.e=false}} +function XJ(a,b){var c;if(!a){return}c=b.loaded/b.total;a.b.h.b.bb(PN(Math.floor(c*100))+vtb)} +function Yz(a,b){var c;c=b==a.e?fkb:gkb+b;bA(c,itb,t6(b),null);if($z(a,b)){nA(a.f);F8(a.b,t6(b));dA(a)}} +function tw(a,b){var c;sD((XC(),a.e.I),otb);c=tJ().create(ptb);c.open(Jkb,(br(),Yq)+a.g.e+qtb+a.f+khb+ar);WJ(c.upload,xw(new vw,a));SJ(c,Cw(new Aw,a));c.send(b)} +function aV(a){XU();while(SU){br();hq(Dr(new Br,wtb+Lh(a)));SU=SU.c}TU=null} +function _U(a){XU();var b;b=new gV;b.b=a;!!TU&&(TU.c=b);TU=b;!SU&&(SU=b);if(VU){UU.$b();return}if(!WU){WU=true;Zz((Vz(),Uz),2,new cV)}} +function fl(a,b,c){var d,e;F8(a.b.b,b)!=null;e=c.Yb();if(e){d=du(new Ut,a,e,a.c);B8(a.g,t6(d.d),d);Lab(a.h,d);a.m.b==a&&Zw(a.m,b,d)}else{a.m.b==a&&tt(a.m,b)}} +function Dw(b,c){var a,e,f;if(c.status!=200){sD((XC(),b.b.e.I),rtb);sk(b.b._(),stb,true);br();hq(Dr(new Br,ttb+c.responseText))}(nw(),mw).remove(b.b.f);if(c.status==200){try{f=QM(c.responseText);ew(b.b.j,b.b);fl(b.b.g,b.b,f);return}catch(a){a=OT(a);if(FN(a,23)){e=a;br();hq(Dr(new Br,utb+Lh(e)+ifb+c.responseText))}else throw a}}F8(b.b.g.b.b,b.b)!=null;ew(b.b.j,b.b)} +function SJ(c,a){var b=c;c.onreadystatechange=function(){if(b.readyState==4){TJ(a,b);b.onreadystatechange=null;b.onprogress=null;b.upload.onprogress=null}}} +var vtb='%',qtb='?filename=',Btb='AsyncLoader2$1',Ctb='AsyncLoader2__Callback',Atb='AsyncLoader2__Super',xtb='AsyncResizer',wtb='Error Resizing image\n',ttb='Error Uploading\n',utb='Exception on Upload\n',ntb='Resizing..',rtb='Upload Error',ytb='UploadFile$1',ztb='UploadFile$2',otb='Uploading..',ptb='beta.httprequest',itb='end',stb='upload-error';_=yo.prototype=new Vf;_.gC=Co;_.tI=0;_.b=null;_.c=null;_.d=null;_=vw.prototype=new Vf;_.gC=zw;_.tI=0;_.b=null;_=Aw.prototype=new Vf;_.gC=Ew;_.tI=0;_.b=null;_=OU.prototype=new Vf;_.gC=QU;_.$b=RU;_.tI=0;var SU=null,TU=null,UU,VU=false,WU=false;_=cV.prototype=new Vf;_.gC=eV;_.Nb=fV;_.tI=95;_=gV.prototype=new Vf;_.gC=iV;_.tI=0;_.b=null;_.c=null;var IO=u5(Qnb,xtb),BP=u5(Qnb,ytb),CP=u5(Qnb,ztb),cR=u5(Zqb,Atb),aR=u5(Zqb,Btb),bR=u5(Zqb,Ctb);eA(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/1.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/1.cache.js new file mode 100644 index 00000000..37f81533 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/1.cache.js @@ -0,0 +1,7 @@ +function SU(){} +function cV(){return uR} +function gV(){var a;while(XU){a=XU;XU=XU.b;!XU&&(YU=null);Kw(a.a.a)}} +function iw(a,b){Hdb(a.e,b);if(!a.d){a.d=true;kw(a)}a.b=false;lw(a)} +function Kw(a){var b;a.a.a=a.a.b.blob;(pw(),ow).captureBlob(a.a.a,a.a.e,Hvb);b=F1(new C1,a.a.e);a.a.c.rb(b);iw(a.a.i,a.a)} +function dV(){$U=true;ZU=(aV(),new SU);cA((_z(),$z),1);!!$stats&&$stats(IA(Ivb,Mlb,null,null));ZU.Zb();!!$stats&&$stats(IA(Ivb,Jvb,null,null))} +var Kvb='AsyncLoader1',Hvb='image/JPEG',Ivb='runCallbacks1';_=SU.prototype=new TU;_.gC=cV;_.Zb=gV;_.tI=0;var uR=f7(ptb,Kvb);dV(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/2.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/2.cache.js new file mode 100644 index 00000000..51e8d46b --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/2.cache.js @@ -0,0 +1,6 @@ +function oV(){} +function AV(){return yR} +function EV(){var a;while(tV){a=tV;tV=tV.b;!tV&&(uV=null);Do(a.a)}} +function BV(){wV=true;vV=(yV(),new oV);cA((_z(),$z),2);!!$stats&&$stats(IA(Mvb,Mlb,null,null));vV.Zb();!!$stats&&$stats(IA(Mvb,Jvb,null,null))} +function Do(a){var b,c,d,e,f;e=($wnd.google&&$wnd.google.gears&&$wnd.google.gears.factory).create(Lvb);e.decode(a.a);d=e.width;c=e.height;f=d/a.b.b;b=c/a.b.a;if(f>b){if(f>1){e.resize(a.b.b,~~Math.max(Math.min(c/f,2147483647),-2147483648));vw(a.c,e.encode());return}vw(a.c,a.a)}else{if(b>1){e.resize(~~Math.max(Math.min(d/b,2147483647),-2147483648),a.b.a);vw(a.c,e.encode());return}vw(a.c,a.a)}} +var Nvb='AsyncLoader2',Lvb='beta.canvas',Mvb='runCallbacks2';_=oV.prototype=new pV;_.gC=AV;_.Zb=EV;_.tI=0;var yR=f7(ptb,Nvb);BV(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/3.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/3.cache.js new file mode 100644 index 00000000..f4fa9cb0 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/4F7AD7D8299143D876CB4071BE00BF02/3.cache.js @@ -0,0 +1,35 @@ +function Ao(){} +function xw(){} +function Cw(){} +function sV(){} +function pV(){} +function FV(){} +function JV(){} +function kA(){fA($z)} +function Eo(){return dP} +function Bw(){return YP} +function Gw(){return ZP} +function rV(){return xR} +function HV(){return vR} +function LV(){return wR} +function fA(a){cA(a,a.d)} +function zw(a,b){a.a=b;return a} +function Ew(a,b){a.a=b;return a} +function yV(){yV=Ceb;vV=new pV} +function IV(a){yV();xV=false;DV(a)} +function pK(a,b){if(!a){return}Fw(a,b)} +function gw(a,b){pab(a.f.a,b)!=null;lw(a);kw(a);Lt(a.a.e)} +function uw(a){if(a.h.c){(UC(),a.d.H).innerText=Ovb;CV(Co(new Ao,a.a,a))}else{vw(a,a.a)}} +function _w(a,b,c){var d;d=M4(a.f,b);ut(a,c,a.H,d,true);vt(a,b)} +function sK(c,b){c.onprogress=function(a){tK(b,a)}} +function Co(a,b,c){a.a=b;a.c=c;a.b=c.h;return a} +function DV(a){yV();while(tV){dr();jq(Fr(new Dr,Xvb+Qh(a)));tV=tV.b}uV=null} +function tK(a,b){var c;if(!a){return}c=b.loaded/b.total;a.a.g.a.ab(lO(Math.floor(c*100))+Wvb)} +function kw(a){var b;if(a.e.b>0){b=$N(Jdb(a.e),37);uw(b)}else{a.d=false}} +function CV(a){yV();var b;b=new JV;b.a=a;!!uV&&(uV.b=b);uV=b;!tV&&(tV=b);if(wV){vV.Zb();return}if(!xV){xV=true;dA((_z(),$z),2,new FV)}} +function cA(a,b){var c;c=b==a.d?Klb:Llb+b;hA(c,Jvb,e8(b),null);if(eA(a,b)){tA(a.e);pab(a.a,e8(b));jA(a)}} +function hl(a,b,c){var d,e;pab(a.a.a,b)!=null;e=c.Xb();if(e){d=fu(new Wt,a,e,a.b);lab(a.f,e8(d.c),d);vcb(a.g,d);a.l.a==a&&_w(a.l,b,d)}else{a.l.a==a&&vt(a.l,b)}} +function Fw(b,c){var a,e,f;if(c.status!=200){(UC(),b.a.d.H).innerText=Svb;uk(b.a.$(),Tvb,true);dr();jq(Fr(new Dr,Uvb+c.responseText))}(pw(),ow).remove(b.a.e);if(c.status==200){try{f=mN(c.responseText);gw(b.a.i,b.a);hl(b.a.f,b.a,f);return}catch(a){a=pU(a);if(bO(a,23)){e=a;dr();jq(Fr(new Dr,Vvb+Qh(e)+Ngb+c.responseText))}else throw a}}pab(b.a.f.a.a,b.a)!=null;gw(b.a.i,b.a)} +function oK(c,a){var b=c;c.onreadystatechange=function(){if(b.readyState==4){pK(a,b);b.onreadystatechange=null;b.onprogress=null;b.upload.onprogress=null}}} +function vw(a,b){var c;(UC(),a.d.H).innerText=Pvb;c=RJ().create(Qvb);c.open(jmb,(dr(),$q)+a.f.d+Rvb+a.e+Rib+cr);sK(c.upload,zw(new xw,a));oK(c,Ew(new Cw,a));c.send(b)} +var Wvb='%',Rvb='?filename=',awb='AsyncLoader2$1',bwb='AsyncLoader2__Callback',_vb='AsyncLoader2__Super',Yvb='AsyncResizer',Xvb='Error Resizing image\n',Uvb='Error Uploading\n',Vvb='Exception on Upload\n',Ovb='Resizing..',Svb='Upload Error',Zvb='UploadFile$1',$vb='UploadFile$2',Pvb='Uploading..',Qvb='beta.httprequest',Jvb='end',Tvb='upload-error';_=Ao.prototype=new $f;_.gC=Eo;_.tI=0;_.a=null;_.b=null;_.c=null;_=xw.prototype=new $f;_.gC=Bw;_.tI=0;_.a=null;_=Cw.prototype=new $f;_.gC=Gw;_.tI=0;_.a=null;_=pV.prototype=new $f;_.gC=rV;_.Zb=sV;_.tI=0;var tV=null,uV=null,vV,wV=false,xV=false;_=FV.prototype=new $f;_.gC=HV;_.Mb=IV;_.tI=95;_=JV.prototype=new $f;_.gC=LV;_.tI=0;_.a=null;_.b=null;var dP=f7(iqb,Yvb),YP=f7(iqb,Zvb),ZP=f7(iqb,$vb),xR=f7(ptb,_vb),vR=f7(ptb,awb),wR=f7(ptb,bwb);kA(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/1.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/1.cache.js new file mode 100644 index 00000000..a0dac49e --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/1.cache.js @@ -0,0 +1,7 @@ +function AU(){} +function MU(){return eR} +function QU(){var a;while(FU){a=FU;FU=FU.b;!FU&&(GU=null);Iw(a.a.a)}} +function gw(a,b){Scb(a.e,b);if(!a.d){a.d=true;iw(a)}a.b=false;jw(a)} +function Iw(a){var b;a.a.a=a.a.b.blob;(nw(),mw).captureBlob(a.a.a,a.a.e,mub);b=k1(new h1,a.a.e);a.a.c.rb(b);gw(a.a.i,a.a)} +function NU(){IU=true;HU=(KU(),new AU);_z((Yz(),Xz),1);!!$stats&&$stats(FA(nub,Ykb,null,null));HU.Zb();!!$stats&&$stats(FA(nub,oub,null,null))} +var pub='AsyncLoader1',mub='image/JPEG',nub='runCallbacks1';_=AU.prototype=new BU;_.gC=MU;_.Zb=QU;_.tI=0;var eR=q6(Yrb,pub);NU(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/2.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/2.cache.js new file mode 100644 index 00000000..453a199b --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/2.cache.js @@ -0,0 +1,6 @@ +function YU(){} +function iV(){return iR} +function mV(){var a;while(bV){a=bV;bV=bV.b;!bV&&(cV=null);Bo(a.a)}} +function jV(){eV=true;dV=(gV(),new YU);_z((Yz(),Xz),2);!!$stats&&$stats(FA(rub,Ykb,null,null));dV.Zb();!!$stats&&$stats(FA(rub,oub,null,null))} +function Bo(a){var b,c,d,e,f;e=($wnd.google&&$wnd.google.gears&&$wnd.google.gears.factory).create(qub);e.decode(a.a);d=e.width;c=e.height;f=d/a.b.b;b=c/a.b.a;if(f>b){if(f>1){e.resize(a.b.b,~~Math.max(Math.min(c/f,2147483647),-2147483648));tw(a.c,e.encode());return}tw(a.c,a.a)}else{if(b>1){e.resize(~~Math.max(Math.min(d/b,2147483647),-2147483648),a.b.a);tw(a.c,e.encode());return}tw(a.c,a.a)}} +var sub='AsyncLoader2',qub='beta.canvas',rub='runCallbacks2';_=YU.prototype=new ZU;_.gC=iV;_.Zb=mV;_.tI=0;var iR=q6(Yrb,sub);jV(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/3.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/3.cache.js new file mode 100644 index 00000000..b5795b52 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/6462B363383D23B8418857B7A6FAD85B/3.cache.js @@ -0,0 +1,35 @@ +function yo(){} +function vw(){} +function Aw(){} +function aV(){} +function ZU(){} +function nV(){} +function rV(){} +function hA(){cA(Xz)} +function Co(){return PO} +function zw(){return IP} +function Ew(){return JP} +function _U(){return hR} +function pV(){return fR} +function tV(){return gR} +function cA(a){_z(a,a.d)} +function xw(a,b){a.a=b;return a} +function Cw(a,b){a.a=b;return a} +function gV(){gV=Ndb;dV=new ZU} +function qV(a){gV();fV=false;lV(a)} +function _J(a,b){if(!a){return}Dw(a,b)} +function ew(a,b){A9(a.f.a,b)!=null;jw(a);iw(a);Jt(a.a.e)} +function sw(a){if(a.h.c){(QC(),a.d.H).innerText=tub;kV(Ao(new yo,a.a,a))}else{tw(a,a.a)}} +function Zw(a,b,c){var d;d=p4(a.f,b);st(a,c,a.H,d,true);tt(a,b)} +function cK(c,b){c.onprogress=function(a){dK(b,a)}} +function iw(a){var b;if(a.e.b>0){b=KN(Ucb(a.e),37);sw(b)}else{a.d=false}} +function dK(a,b){var c;if(!a){return}c=b.loaded/b.total;a.a.g.a.ab(XN(Math.floor(c*100))+Bub)} +function lV(a){gV();while(bV){br();hq(Dr(new Br,Cub+Oh(a)));bV=bV.b}cV=null} +function Ao(a,b,c){a.a=b;a.c=c;a.b=c.h;return a} +function _z(a,b){var c;c=b==a.d?Wkb:Xkb+b;eA(c,oub,p7(b),null);if(bA(a,b)){qA(a.e);A9(a.a,p7(b));gA(a)}} +function tw(a,b){var c;(QC(),a.d.H).innerText=uub;c=BJ().create(vub);c.open(tlb,(br(),Yq)+a.f.d+wub+a.e+bib+ar);cK(c.upload,xw(new vw,a));$J(c,Cw(new Aw,a));c.send(b)} +function kV(a){gV();var b;b=new rV;b.a=a;!!cV&&(cV.b=b);cV=b;!bV&&(bV=b);if(eV){dV.Zb();return}if(!fV){fV=true;aA((Yz(),Xz),2,new nV)}} +function fl(a,b,c){var d,e;A9(a.a.a,b)!=null;e=c.Xb();if(e){d=du(new Ut,a,e,a.b);w9(a.f,p7(d.c),d);Gbb(a.g,d);a.l.a==a&&Zw(a.l,b,d)}else{a.l.a==a&&tt(a.l,b)}} +function Dw(b,c){var a,e,f;if(c.status!=200){(QC(),b.a.d.H).innerText=xub;sk(b.a.$(),yub,true);br();hq(Dr(new Br,zub+c.responseText))}(nw(),mw).remove(b.a.e);if(c.status==200){try{f=YM(c.responseText);ew(b.a.i,b.a);fl(b.a.f,b.a,f);return}catch(a){a=ZT(a);if(NN(a,23)){e=a;br();hq(Dr(new Br,Aub+Oh(e)+Zfb+c.responseText))}else throw a}}A9(b.a.f.a.a,b.a)!=null;ew(b.a.i,b.a)} +function $J(c,a){var b=c;c.onreadystatechange=function(){if(b.readyState==4){_J(a,b);b.onreadystatechange=null;b.onprogress=null;b.upload.onprogress=null}}} +var Bub='%',wub='?filename=',Hub='AsyncLoader2$1',Iub='AsyncLoader2__Callback',Gub='AsyncLoader2__Super',Dub='AsyncResizer',Cub='Error Resizing image\n',zub='Error Uploading\n',Aub='Exception on Upload\n',tub='Resizing..',xub='Upload Error',Eub='UploadFile$1',Fub='UploadFile$2',uub='Uploading..',vub='beta.httprequest',oub='end',yub='upload-error';_=yo.prototype=new Yf;_.gC=Co;_.tI=0;_.a=null;_.b=null;_.c=null;_=vw.prototype=new Yf;_.gC=zw;_.tI=0;_.a=null;_=Aw.prototype=new Yf;_.gC=Ew;_.tI=0;_.a=null;_=ZU.prototype=new Yf;_.gC=_U;_.Zb=aV;_.tI=0;var bV=null,cV=null,dV,eV=false,fV=false;_=nV.prototype=new Yf;_.gC=pV;_.Mb=qV;_.tI=95;_=rV.prototype=new Yf;_.gC=tV;_.tI=0;_.a=null;_.b=null;var PO=q6(Rob,Dub),IP=q6(Rob,Eub),JP=q6(Rob,Fub),hR=q6(Yrb,Gub),fR=q6(Yrb,Hub),gR=q6(Yrb,Iub);hA(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/1.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/1.cache.js new file mode 100644 index 00000000..4428a14f --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/1.cache.js @@ -0,0 +1,9 @@ +function wQ(){} +function tQ(){} +function CQ(){} +function sQ(){} +function AQ(){return fN} +function vQ(){return eN} +function yQ(){yQ=m8;xQ=new tQ} +function BQ(){xQ=(yQ(),new sQ);sx((px(),ox),1);!!$stats&&$stats(Yx(snb,tnb,null,null));xQ.Tb();!!$stats&&$stats(Yx(snb,unb,null,null))} +var xnb='AsyncLoader1',wnb='AsyncLoader1__Super',snb='runCallbacks1';_=tQ.prototype=new zf;_.gC=vQ;_.Tb=wQ;_.tI=0;_=sQ.prototype=new tQ;_.gC=AQ;_.Tb=CQ;_.tI=0;var xQ;var eN=S0(vnb,wnb),fN=S0(vnb,xnb);BQ(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/2.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/2.cache.js new file mode 100644 index 00000000..fe89e09b --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/2.cache.js @@ -0,0 +1,9 @@ +function HQ(){} +function EQ(){} +function NQ(){} +function DQ(){} +function LQ(){return hN} +function GQ(){return gN} +function JQ(){JQ=m8;IQ=new EQ} +function MQ(){IQ=(JQ(),new DQ);sx((px(),ox),2);!!$stats&&$stats(Yx(ynb,tnb,null,null));IQ.Tb();!!$stats&&$stats(Yx(ynb,unb,null,null))} +var Anb='AsyncLoader2',znb='AsyncLoader2__Super',ynb='runCallbacks2';_=EQ.prototype=new zf;_.gC=GQ;_.Tb=HQ;_.tI=0;_=DQ.prototype=new EQ;_.gC=LQ;_.Tb=NQ;_.tI=0;var IQ;var gN=S0(vnb,znb),hN=S0(vnb,Anb);MQ(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/3.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/3.cache.js new file mode 100644 index 00000000..efb84b56 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/71ED95F3DFB964762667E45E2922704D/3.cache.js @@ -0,0 +1,54 @@ +function nx(){} +function Bx(){} +function Lx(){} +function Px(){} +function ey(){} +function J5(){} +function R5(){} +function zx(){ux(ox)} +function Ax(){return gM} +function Kx(){return cM} +function Ox(){return dM} +function Tx(){return eM} +function hy(){return fM} +function O5(){return jP} +function U5(){return iP} +function ux(a){sx(a,a.d)} +function Ux(a){Sx(this,a)} +function Gx(a){a.c=0;a.d=0} +function Jx(a){return a.d-a.c} +function O1(){return this.b} +function Q5(){return this.c.b.e} +function Hx(a){return a.b[a.c]} +function Fx(a,b){a.b[a.d++]=b} +function Rx(a,b){a.b=b;return a} +function T5(a,b){a.b=b;return a} +function V5(){return m5(this.b.b)} +function Ix(a){return a.b[a.c++]} +function N5(a){return S3(this.b,a)} +function Nx(a,b){cz(a);a.g=Dnb+b;return a} +function gy(a,b,c){a.c=b;a.b=c;return a} +function L5(a,b,c){a.b=b;a.c=c;return a} +function Ex(a,b){a.b=LJ(yP,0,-1,b,1);return a} +function wx(a,b,c,d){!!$stats&&$stats(Yx(a,b,c,d))} +function cy(b,c){function d(a){c.Hb(a)} +return __gwtStartLoadingFragment(b,d)} +function W5(){var a;a=_J(n5(this.b.b),61).hc();return a} +function P5(){var a;a=x4(new v4,this.c.b);return T5(new R5,a)} +function px(){px=m8;ox=rx(new nx,3,MJ(yP,0,-1,[]))} +function F3(a){var b;b=n4(new g4,a);return L5(new J5,a,b)} +function v7(a){if(a.c==0){throw e8(new c8)}} +function t7(a){var b;v7(a);--a.c;b=a.b.b;P7(b);return b.d} +function sx(a,b){var c;c=b==a.d?Bnb:Cnb+b;wx(c,unb,R1(b),null);if(tx(a,b)){Ix(a.e);a4(a.b,R1(b));yx(a)}} +function dy(a,b){var c,d;c=cy(a,b);if(c==null){return}d=v0();d.open(zfb,c,true);t0(d,gy(new ey,d,b));d.send(null)} +function tx(a,b){var c,d,e,f;if(b==a.d){return true}for(d=a.c,e=0,f=d.length;e1){return}if(Jx(a.e)>0){c=Hx(a.e);wx(c==a.d?Bnb:Cnb+c,tnb,R1(c),null);dy(c,Rx(new Px,a));return}while(Jx(a.f)>0){c=Ix(a.f);b=_J(t7(a.g),41);wx(c==a.d?Bnb:Cnb+c,tnb,R1(c),null);dy(c,b)}} +function Sx(b,c){var a,e,f,g,h,i;h=f6(new c6);while(Jx(b.b.f)>0){g6(h,_J(t7(b.b.g),41));Ix(b.b.f)}Gx(b.b.f);i6(h,F3(b.b.b));O3(b.b.b);i=null;for(g=l5(new i5,h);g.bb){if(f>1){e.resize(a.c.c,~~Math.max(Math.min(c/f,2147483647),-2147483648));Ov(a.d,e.encode());return}Ov(a.d,a.b)}else{if(b>1){e.resize(~~Math.max(Math.min(d/b,2147483647),-2147483648),a.c.b);Ov(a.d,e.encode());return}Ov(a.d,a.b)}} -var Asb='AsyncLoader2',ysb='beta.canvas',zsb='runCallbacks2';_=OT.prototype=new PT;_.gC=$T;_.cc=cU;_.tI=0;var aQ=T4(hqb,Asb);_T(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/826A0FAD0C07BC304C641864F5274BFC/3.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/826A0FAD0C07BC304C641864F5274BFC/3.cache.js deleted file mode 100644 index 665e10df..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/826A0FAD0C07BC304C641864F5274BFC/3.cache.js +++ /dev/null @@ -1,35 +0,0 @@ -function uo(){} -function Qv(){} -function Vv(){} -function ST(){} -function PT(){} -function dU(){} -function hU(){} -function Vy(){Qy(Jy)} -function yo(){return NN} -function Uv(){return BO} -function Zv(){return CO} -function RT(){return _P} -function fU(){return ZP} -function jU(){return $P} -function Qy(a){Ny(a,a.e)} -function Sv(a,b){a.b=b;return a} -function Xv(a,b){a.b=b;return a} -function YT(){YT=pcb;VT=new PT} -function gU(a){YT();XT=false;bU(a)} -function YI(a,b){if(!a){return}Yv(a,b)} -function _I(c,b){c.onprogress=function(a){aJ(b,a)}} -function wo(a,b,c){a.b=b;a.d=c;a.c=c.i;return a} -function rw(a,b,c){var d;d=D2(a.g,b);Ts(a,c,a.I,d,true);Us(a,b)} -function Av(a,b){c8(a.g.b,b)!=null;Ev(a);Dv(a);it(a.b.e)} -function Nv(a){if(a.i.d){uC((aC(),a.e.I),Bsb);aU(wo(new uo,a.b,a))}else{Ov(a,a.b)}} -function Dv(a){var b;if(a.f.c>0){b=HM(wbb(a.f),37);Nv(b)}else{a.e=false}} -function aJ(a,b){var c;if(!a){return}c=b.loaded/b.total;a.b.h.b.bb(UM(Math.floor(c*100))+Isb)} -function Ny(a,b){var c;c=b==a.e?tjb:ujb+b;Sy(c,wsb,S5(b),null);if(Py(a,b)){cz(a.f);c8(a.b,S5(b));Uy(a)}} -function Ov(a,b){var c;uC((aC(),a.e.I),Csb);c=yI().create(Dsb);c.open(_jb,($o(),Vo)+a.g.e+Esb+a.f+mgb+Zo);_I(c.upload,Sv(new Qv,a));XI(c,Xv(new Vv,a));c.send(b)} -function bU(a){YT();while(TT){$o();Zq(gr(new xp,Jsb+Hh(a)));TT=TT.c}UT=null} -function aU(a){YT();var b;b=new hU;b.b=a;!!UT&&(UT.c=b);UT=b;!TT&&(TT=b);if(WT){VT.cc();return}if(!XT){XT=true;Oy((Ky(),Jy),2,new dU)}} -function bl(a,b,c){var d,e;c8(a.b.b,b)!=null;e=c.ac();if(e){d=Et(new tt,a,e,a.c);$7(a.g,S5(d.d),d);iab(a.h,d);a.m.b==a&&rw(a.m,b,d)}else{a.m.b==a&&Us(a.m,b)}} -function Yv(b,c){var a,e,f;if(c.status!=200){uC((aC(),b.b.e.I),Fsb);ok(b.b._(),Gsb,true)}(Iv(),Hv).remove(b.b.f);if(c.status==200){try{f=VL(c.responseText);Av(b.b.j,b.b);bl(b.b.g,b.b,f);return}catch(a){a=PS(a);if(KM(a,23)){e=a;$o();Zq(gr(new xp,Hsb+Hh(e)+Ceb+c.responseText))}else throw a}}c8(b.b.g.b.b,b.b)!=null;Av(b.b.j,b.b)} -function XI(c,a){var b=c;c.onreadystatechange=function(){if(b.readyState==4){YI(a,b);b.onreadystatechange=null;b.onprogress=null;b.upload.onprogress=null}}} -var Isb='%',Esb='?filename=',Osb='AsyncLoader2$1',Psb='AsyncLoader2__Callback',Nsb='AsyncLoader2__Super',Ksb='AsyncResizer',Jsb='Error Resizing image\n',Hsb='Exception on Upload\n',Bsb='Resizing..',Fsb='Upload Error',Lsb='UploadFile$1',Msb='UploadFile$2',Csb='Uploading..',Dsb='beta.httprequest',wsb='end',Gsb='upload-error';_=uo.prototype=new Rf;_.gC=yo;_.tI=0;_.b=null;_.c=null;_.d=null;_=Qv.prototype=new Rf;_.gC=Uv;_.tI=0;_.b=null;_=Vv.prototype=new Rf;_.gC=Zv;_.tI=0;_.b=null;_=PT.prototype=new Rf;_.gC=RT;_.cc=ST;_.tI=0;var TT=null,UT=null,VT,WT=false,XT=false;_=dU.prototype=new Rf;_.gC=fU;_.Nb=gU;_.tI=89;_=hU.prototype=new Rf;_.gC=jU;_.tI=0;_.b=null;_.c=null;var NN=T4(gnb,Ksb),BO=T4(gnb,Lsb),CO=T4(gnb,Msb),_P=T4(hqb,Nsb),ZP=T4(hqb,Osb),$P=T4(hqb,Psb);Vy(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/1.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/1.cache.js new file mode 100644 index 00000000..843f751b --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/1.cache.js @@ -0,0 +1,9 @@ +function HQ(){} +function EQ(){} +function NQ(){} +function DQ(){} +function LQ(){return kN} +function GQ(){return jN} +function JQ(){JQ=h9;IQ=new EQ} +function MQ(){IQ=(JQ(),new DQ);vx((sx(),rx),1);!!$stats&&$stats(_x(Aob,Bob,null,null));IQ.Sb();!!$stats&&$stats(_x(Aob,Cob,null,null))} +var Fob='AsyncLoader1',Eob='AsyncLoader1__Super',Aob='runCallbacks1';_=EQ.prototype=new Cf;_.gC=GQ;_.Sb=HQ;_.tI=0;_=DQ.prototype=new EQ;_.gC=LQ;_.Sb=NQ;_.tI=0;var IQ;var jN=O1(Dob,Eob),kN=O1(Dob,Fob);MQ(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/2.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/2.cache.js new file mode 100644 index 00000000..f205d9f0 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/2.cache.js @@ -0,0 +1,9 @@ +function SQ(){} +function PQ(){} +function YQ(){} +function OQ(){} +function WQ(){return mN} +function RQ(){return lN} +function UQ(){UQ=h9;TQ=new PQ} +function XQ(){TQ=(UQ(),new OQ);vx((sx(),rx),2);!!$stats&&$stats(_x(Gob,Bob,null,null));TQ.Sb();!!$stats&&$stats(_x(Gob,Cob,null,null))} +var Iob='AsyncLoader2',Hob='AsyncLoader2__Super',Gob='runCallbacks2';_=PQ.prototype=new Cf;_.gC=RQ;_.Sb=SQ;_.tI=0;_=OQ.prototype=new PQ;_.gC=WQ;_.Sb=YQ;_.tI=0;var TQ;var lN=O1(Dob,Hob),mN=O1(Dob,Iob);XQ(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/3.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/3.cache.js new file mode 100644 index 00000000..2b1b4b52 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/884CB866FECF37EDDE4914CA60AF2511/3.cache.js @@ -0,0 +1,54 @@ +function qx(){} +function Ex(){} +function Ox(){} +function Sx(){} +function hy(){} +function E6(){} +function M6(){} +function Cx(){xx(rx)} +function Dx(){return nM} +function Nx(){return jM} +function Rx(){return kM} +function Wx(){return lM} +function ky(){return mM} +function J6(){return uP} +function P6(){return tP} +function xx(a){vx(a,a.c)} +function Xx(a){Vx(this,a)} +function Jx(a){a.b=0;a.c=0} +function Mx(a){return a.c-a.b} +function K2(){return this.a} +function Kx(a){return a.a[a.b]} +function Ix(a,b){a.a[a.c++]=b} +function Ux(a,b){a.a=b;return a} +function O6(a,b){a.a=b;return a} +function Lx(a){return a.a[a.b++]} +function L6(){return this.b.a.d} +function Q6(){return h6(this.a.a)} +function I6(a){return N4(this.a,a)} +function q8(a){if(a.b==0){throw _8(new Z8)}} +function G6(a,b,c){a.a=b;a.b=c;return a} +function jy(a,b,c){a.b=b;a.a=c;return a} +function Qx(a,b){gz(a);a.f=Lob+b;return a} +function Hx(a,b){a.a=TJ(JP,0,-1,b,1);return a} +function A4(a){var b;b=i5(new b5,a);return G6(new E6,a,b)} +function K6(){var a;a=s5(new q5,this.b.a);return O6(new M6,a)} +function R6(){var a;a=hK(i6(this.a.a),61).hc();return a} +function o8(a){var b;q8(a);--a.b;b=a.a.a;K8(b);return b.c} +function zx(a,b,c,d){!!$stats&&$stats(_x(a,b,c,d))} +function fy(b,c){function d(a){c.Gb(a)} +return __gwtStartLoadingFragment(b,d)} +function N4(a,b){if(a.c&&S7(a.b,b)){return true}else if(M4(a,b)){return true}else if(K4(a,b)){return true}return false} +function ux(a,b,c){sx();a.a=Q7(new O7);a.f=k8(new i8);a.c=b;a.b=c;a.e=Hx(new Ex,b+1);return a} +function sx(){sx=h9;rx=ux(new qx,3,UJ(JP,0,-1,[]))} +function gy(a,b){var c,d;c=fy(a,b);if(c==null){return}d=r1();d.open(lgb,c,true);p1(d,jy(new hy,d,b));d.send(null)} +function wx(a,b){var c,d,e,f;if(b==a.c){return true}for(d=a.b,e=0,f=d.length;e0){b7(h,hK(o8(b.a.f),41));Lx(b.a.e)}Jx(b.a.e);d7(h,A4(b.a.a));J4(b.a.a);i=null;for(g=g6(new d6,h);g.a1){return}if(Mx(a.d)>0){c=Kx(a.d);zx(c==a.c?Job:Kob+c,Bob,N2(c),null);gy(c,Ux(new Sx,a));return}while(Mx(a.e)>0){c=Lx(a.e);b=hK(o8(a.f),41);zx(c==a.c?Job:Kob+c,Bob,N2(c),null);gy(c,b)}} +var Tob='AbstractMap$2',Uob='AbstractMap$2$1',Oob='AsyncFragmentLoader',Pob='AsyncFragmentLoader$BoundedIntQueue',Qob='AsyncFragmentLoader$HttpDownloadFailure',Rob='AsyncFragmentLoader$InitialFragmentDownloadFailed',Sob='AsyncFragmentLoader$XhrLoadingStrategy$1',Lob='HTTP download failed with status ',Nob='[I',Bob='begin',Dob='com.google.gwt.lang.asyncloaders.',Kob='download',Cob='end',Job='leftoversDownload',Mob='runAsync';_=qx.prototype=new Cf;_.gC=Dx;_.tI=0;_.b=null;_.c=0;_.d=null;_.e=null;var rx;_=Ex.prototype=new Cf;_.gC=Nx;_.tI=0;_.a=null;_.b=0;_.c=0;_=Ox.prototype=new kw;_.gC=Rx;_.tI=76;_=Sx.prototype=new Cf;_.gC=Wx;_.Gb=Xx;_.tI=77;_.a=null;_=hy.prototype=new Cf;_.gC=ky;_.Hb=ly;_.tI=0;_.a=null;_.b=null;_=C2.prototype;_.ac=K2;_=E6.prototype=new l4;_.cc=I6;_.gC=J6;_.nb=K6;_.dc=L6;_.tI=0;_.a=null;_.b=null;_=M6.prototype=new Cf;_.gC=P6;_.Tb=Q6;_.Ub=R6;_.tI=0;_.a=null;var JP=N1(lbb,Nob),nM=O1(ilb,Oob),jM=O1(ilb,Pob),kM=O1(ilb,Qob),lM=O1(ilb,Rob),mM=O1(ilb,Sob),uP=O1(jjb,Tob),tP=O1(jjb,Uob);Cx(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/1.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/1.cache.js new file mode 100644 index 00000000..5cd9b09c --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/1.cache.js @@ -0,0 +1,9 @@ +function zQ(){} +function wQ(){} +function FQ(){} +function vQ(){} +function DQ(){return hN} +function yQ(){return gN} +function BQ(){BQ=A8;AQ=new wQ} +function EQ(){AQ=(BQ(),new vQ);ux((rx(),qx),1);!!$stats&&$stats($x(Knb,Lnb,null,null));AQ.Sb();!!$stats&&$stats($x(Knb,Mnb,null,null))} +var Pnb='AsyncLoader1',Onb='AsyncLoader1__Super',Knb='runCallbacks1';_=wQ.prototype=new Af;_.gC=yQ;_.Sb=zQ;_.tI=0;_=vQ.prototype=new wQ;_.gC=DQ;_.Sb=FQ;_.tI=0;var AQ;var gN=f1(Nnb,Onb),hN=f1(Nnb,Pnb);EQ(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/2.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/2.cache.js new file mode 100644 index 00000000..4ffb2aa4 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/2.cache.js @@ -0,0 +1,9 @@ +function KQ(){} +function HQ(){} +function QQ(){} +function GQ(){} +function OQ(){return jN} +function JQ(){return iN} +function MQ(){MQ=A8;LQ=new HQ} +function PQ(){LQ=(MQ(),new GQ);ux((rx(),qx),2);!!$stats&&$stats($x(Qnb,Lnb,null,null));LQ.Sb();!!$stats&&$stats($x(Qnb,Mnb,null,null))} +var Snb='AsyncLoader2',Rnb='AsyncLoader2__Super',Qnb='runCallbacks2';_=HQ.prototype=new Af;_.gC=JQ;_.Sb=KQ;_.tI=0;_=GQ.prototype=new HQ;_.gC=OQ;_.Sb=QQ;_.tI=0;var LQ;var iN=f1(Nnb,Rnb),jN=f1(Nnb,Snb);PQ(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/3.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/3.cache.js new file mode 100644 index 00000000..114ed2d9 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/9DC95FB4BEC084EF810751F04B440FD7/3.cache.js @@ -0,0 +1,54 @@ +function px(){} +function Dx(){} +function Nx(){} +function Rx(){} +function gy(){} +function X5(){} +function d6(){} +function Bx(){wx(qx)} +function Cx(){return iM} +function Mx(){return eM} +function Qx(){return fM} +function Vx(){return gM} +function jy(){return hM} +function a6(){return mP} +function g6(){return lP} +function wx(a){ux(a,a.d)} +function Wx(a){Ux(this,a)} +function Ix(a){a.c=0;a.d=0} +function Lx(a){return a.d-a.c} +function b2(){return this.b} +function c6(){return this.c.b.e} +function Jx(a){return a.b[a.c]} +function Hx(a,b){a.b[a.d++]=b} +function Tx(a,b){a.b=b;return a} +function f6(a,b){a.b=b;return a} +function h6(){return A5(this.b.b)} +function Kx(a){return a.b[a.c++]} +function _5(a){return e4(this.b,a)} +function J7(a){if(a.c==0){throw s8(new q8)}} +function Z5(a,b,c){a.b=b;a.c=c;return a} +function iy(a,b,c){a.c=b;a.b=c;return a} +function Px(a,b){fz(a);a.g=Vnb+b;return a} +function Gx(a,b){a.b=NJ(BP,0,-1,b,1);return a} +function H7(a){var b;J7(a);--a.c;b=a.b.b;b8(b);return b.d} +function i6(){var a;a=bK(B5(this.b.b),61).gc();return a} +function b6(){var a;a=L4(new J4,this.c.b);return f6(new d6,a)} +function T3(a){var b;b=B4(new u4,a);return Z5(new X5,a,b)} +function yx(a,b,c,d){!!$stats&&$stats($x(a,b,c,d))} +function ey(b,c){function d(a){c.Hb(a)} +return __gwtStartLoadingFragment(b,d)} +function e4(a,b){if(a.d&&j7(a.c,b)){return true}else if(d4(a,b)){return true}else if(b4(a,b)){return true}return false} +function tx(a,b,c){rx();a.b=h7(new f7);a.g=D7(new B7);a.d=b;a.c=c;a.f=Gx(new Dx,b+1);return a} +function rx(){rx=A8;qx=tx(new px,3,OJ(BP,0,-1,[]))} +function fy(a,b){var c,d;c=ey(a,b);if(c==null){return}d=K0();d.open(Nfb,c,true);I0(d,iy(new gy,d,b));d.send(null)} +function vx(a,b){var c,d,e,f;if(b==a.d){return true}for(d=a.c,e=0,f=d.length;e0){u6(h,bK(H7(b.b.g),41));Kx(b.b.f)}Ix(b.b.f);w6(h,T3(b.b.b));a4(b.b.b);i=null;for(g=z5(new w5,h);g.b1){return}if(Lx(a.e)>0){c=Jx(a.e);yx(c==a.d?Tnb:Unb+c,Lnb,e2(c),null);fy(c,Tx(new Rx,a));return}while(Lx(a.f)>0){c=Kx(a.f);b=bK(H7(a.g),41);yx(c==a.d?Tnb:Unb+c,Lnb,e2(c),null);fy(c,b)}} +var bob='AbstractMap$2',cob='AbstractMap$2$1',Ynb='AsyncFragmentLoader',Znb='AsyncFragmentLoader$BoundedIntQueue',$nb='AsyncFragmentLoader$HttpDownloadFailure',_nb='AsyncFragmentLoader$InitialFragmentDownloadFailed',aob='AsyncFragmentLoader$XhrLoadingStrategy$1',Vnb='HTTP download failed with status ',Xnb='[I',Lnb='begin',Nnb='com.google.gwt.lang.asyncloaders.',Unb='download',Mnb='end',Tnb='leftoversDownload',Wnb='runAsync';_=px.prototype=new Af;_.gC=Cx;_.tI=0;_.c=null;_.d=0;_.e=null;_.f=null;var qx;_=Dx.prototype=new Af;_.gC=Mx;_.tI=0;_.b=null;_.c=0;_.d=0;_=Nx.prototype=new mw;_.gC=Qx;_.tI=76;_=Rx.prototype=new Af;_.gC=Vx;_.Hb=Wx;_.tI=77;_.b=null;_=gy.prototype=new Af;_.gC=jy;_.Ib=ky;_.tI=0;_.b=null;_.c=null;_=V1.prototype;_._b=b2;_=X5.prototype=new E3;_.bc=_5;_.gC=a6;_.ob=b6;_.cc=c6;_.tI=0;_.b=null;_.c=null;_=d6.prototype=new Af;_.gC=g6;_.Tb=h6;_.Ub=i6;_.tI=0;_.b=null;var BP=e1(Dab,Xnb),iM=f1(wkb,Ynb),eM=f1(wkb,Znb),fM=f1(wkb,$nb),gM=f1(wkb,_nb),hM=f1(wkb,aob),mP=f1(xib,bob),lP=f1(xib,cob);Bx(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/1.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/1.cache.js new file mode 100644 index 00000000..4f191dc0 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/1.cache.js @@ -0,0 +1,7 @@ +function SU(){} +function cV(){return yR} +function gV(){var a;while(XU){a=XU;XU=XU.c;!XU&&(YU=null);Pw(a.b.b)}} +function nw(a,b){Wcb(a.f,b);if(!a.e){a.e=true;pw(a)}a.c=false;qw(a)} +function Pw(a){var b;a.b.b=a.b.c.blob;(uw(),tw).captureBlob(a.b.b,a.b.f,lub);b=_0(new Y0,a.b.f);a.b.d.sb(b);nw(a.b.j,a.b)} +function dV(){$U=true;ZU=(aV(),new SU);dA((aA(),_z),1);!!$stats&&$stats(JA(mub,blb,null,null));ZU.cc();!!$stats&&$stats(JA(mub,nub,null,null))} +var oub='AsyncLoader1',lub='image/JPEG',mub='runCallbacks1';_=SU.prototype=new TU;_.gC=cV;_.cc=gV;_.tI=0;var yR=u6($rb,oub);dV(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/2.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/2.cache.js new file mode 100644 index 00000000..35fe43df --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/2.cache.js @@ -0,0 +1,6 @@ +function oV(){} +function AV(){return CR} +function EV(){var a;while(tV){a=tV;tV=tV.c;!tV&&(uV=null);Io(a.b)}} +function BV(){wV=true;vV=(yV(),new oV);dA((aA(),_z),2);!!$stats&&$stats(JA(qub,blb,null,null));vV.cc();!!$stats&&$stats(JA(qub,nub,null,null))} +function Io(a){var b,c,d,e,f;e=($wnd.google&&$wnd.google.gears&&$wnd.google.gears.factory).create(pub);e.decode(a.b);d=e.width;c=e.height;f=d/a.c.c;b=c/a.c.b;if(f>b){if(f>1){e.resize(a.c.c,~~Math.max(Math.min(c/f,2147483647),-2147483648));Aw(a.d,e.encode());return}Aw(a.d,a.b)}else{if(b>1){e.resize(~~Math.max(Math.min(d/b,2147483647),-2147483648),a.c.b);Aw(a.d,e.encode());return}Aw(a.d,a.b)}} +var rub='AsyncLoader2',pub='beta.canvas',qub='runCallbacks2';_=oV.prototype=new pV;_.gC=AV;_.cc=EV;_.tI=0;var CR=u6($rb,rub);BV(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/3.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/3.cache.js new file mode 100644 index 00000000..a7e3e3d6 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/A8FBB0ADAFEE7F8EA1CDB15765D13A7F/3.cache.js @@ -0,0 +1,35 @@ +function Fo(){} +function Cw(){} +function Hw(){} +function sV(){} +function pV(){} +function FV(){} +function JV(){} +function lA(){gA(_z)} +function Jo(){return cP} +function Gw(){return XP} +function Lw(){return YP} +function rV(){return BR} +function HV(){return zR} +function LV(){return AR} +function gA(a){dA(a,a.e)} +function Ew(a,b){a.b=b;return a} +function Jw(a,b){a.b=b;return a} +function yV(){yV=Rdb;vV=new pV} +function IV(a){yV();xV=false;DV(a)} +function nK(a,b){if(!a){return}Kw(a,b)} +function qK(c,b){c.onprogress=function(a){rK(b,a)}} +function Ho(a,b,c){a.b=b;a.d=c;a.c=c.i;return a} +function ex(a,b,c){var d;d=e4(a.g,b);zt(a,c,a.I,d,true);At(a,b)} +function lw(a,b){E9(a.g.b,b)!=null;qw(a);pw(a);Qt(a.b.f)} +function zw(a){if(a.i.d){LD((rD(),a.e.I),sub);CV(Ho(new Fo,a.b,a))}else{Aw(a,a.b)}} +function DV(a){yV();while(tV){ir();oq(Kr(new Ir,Bub+Sh(a)));tV=tV.c}uV=null} +function rK(a,b){var c;if(!a){return}c=b.loaded/b.total;a.b.h.b.bb(jO(Math.floor(c*100))+Aub)} +function dA(a,b){var c;c=b==a.e?_kb:alb+b;iA(c,nub,t7(b),null);if(fA(a,b)){uA(a.f);E9(a.b,t7(b));kA(a)}} +function pw(a){var b;if(a.f.c>0){b=YN(Ycb(a.f),37);zw(b)}else{a.e=false}} +function CV(a){yV();var b;b=new JV;b.b=a;!!uV&&(uV.c=b);uV=b;!tV&&(tV=b);if(wV){vV.cc();return}if(!xV){xV=true;eA((aA(),_z),2,new FV)}} +function ml(a,b,c){var d,e;E9(a.b.b,b)!=null;e=c.ac();if(e){d=ku(new _t,a,e,a.c);A9(a.g,t7(d.d),d);Kbb(a.h,d);a.m.b==a&&ex(a.m,b,d)}else{a.m.b==a&&At(a.m,b)}} +function Kw(b,c){var a,e,f;if(c.status!=200){LD((rD(),b.b.e.I),wub);zk(b.b._(),xub,true);ir();oq(Kr(new Ir,yub+c.responseText))}(uw(),tw).remove(b.b.f);if(c.status==200){try{f=kN(c.responseText);lw(b.b.j,b.b);ml(b.b.g,b.b,f);return}catch(a){a=pU(a);if(_N(a,23)){e=a;ir();oq(Kr(new Ir,zub+Sh(e)+cgb+c.responseText))}else throw a}}E9(b.b.g.b.b,b.b)!=null;lw(b.b.j,b.b)} +function mK(c,a){var b=c;c.onreadystatechange=function(){if(b.readyState==4){nK(a,b);b.onreadystatechange=null;b.onprogress=null;b.upload.onprogress=null}}} +function Aw(a,b){var c;LD((rD(),a.e.I),tub);c=PJ().create(uub);c.open(Hlb,(ir(),dr)+a.g.e+vub+a.f+eib+hr);qK(c.upload,Ew(new Cw,a));mK(c,Jw(new Hw,a));c.send(b)} +var Aub='%',vub='?filename=',Gub='AsyncLoader2$1',Hub='AsyncLoader2__Callback',Fub='AsyncLoader2__Super',Cub='AsyncResizer',Bub='Error Resizing image\n',yub='Error Uploading\n',zub='Exception on Upload\n',sub='Resizing..',wub='Upload Error',Dub='UploadFile$1',Eub='UploadFile$2',tub='Uploading..',uub='beta.httprequest',nub='end',xub='upload-error';_=Fo.prototype=new ag;_.gC=Jo;_.tI=0;_.b=null;_.c=null;_.d=null;_=Cw.prototype=new ag;_.gC=Gw;_.tI=0;_.b=null;_=Hw.prototype=new ag;_.gC=Lw;_.tI=0;_.b=null;_=pV.prototype=new ag;_.gC=rV;_.cc=sV;_.tI=0;var tV=null,uV=null,vV,wV=false,xV=false;_=FV.prototype=new ag;_.gC=HV;_.Nb=IV;_.tI=95;_=JV.prototype=new ag;_.gC=LV;_.tI=0;_.b=null;_.c=null;var cP=u6(Oob,Cub),XP=u6(Oob,Dub),YP=u6(Oob,Eub),BR=u6($rb,Fub),zR=u6($rb,Gub),AR=u6($rb,Hub);lA(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/AE48EA5D8ECD3E90C23EBF393DC6958A/1.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/AE48EA5D8ECD3E90C23EBF393DC6958A/1.cache.js deleted file mode 100644 index 61de748f..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/AE48EA5D8ECD3E90C23EBF393DC6958A/1.cache.js +++ /dev/null @@ -1,7 +0,0 @@ -function jT(){} -function vT(){return SP} -function zT(){var a;while(oT){a=oT;oT=oT.c;!oT&&(pT=null);dw(a.b.b)}} -function Ev(a,b){sbb(a.f,b);if(!a.e){a.e=true;Fv(a)}a.c=false;Gv(a)} -function dw(a){var b;a.b.b=a.b.c.blob;(Kv(),Jv).captureBlob(a.b.b,a.b.f,vsb);b=q_(new n_,a.b.f);a.b.d.ub(b);Ev(a.b.j,a.b)} -function wT(){rT=true;qT=(tT(),new jT);Py((My(),Ly),1);!!$stats&&$stats(tz(wsb,yjb,null,null));qT.ac();!!$stats&&$stats(tz(wsb,xsb,null,null))} -var ysb='AsyncLoader1',vsb='image/JPEG',wsb='runCallbacks1';_=jT.prototype=new kT;_.gC=vT;_.ac=zT;_.tI=0;var SP=R4(jqb,ysb);wT(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/AE48EA5D8ECD3E90C23EBF393DC6958A/2.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/AE48EA5D8ECD3E90C23EBF393DC6958A/2.cache.js deleted file mode 100644 index f2b14993..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/AE48EA5D8ECD3E90C23EBF393DC6958A/2.cache.js +++ /dev/null @@ -1,6 +0,0 @@ -function HT(){} -function TT(){return WP} -function XT(){var a;while(MT){a=MT;MT=MT.c;!MT&&(NT=null);yo(a.b)}} -function UT(){PT=true;OT=(RT(),new HT);Py((My(),Ly),2);!!$stats&&$stats(tz(Asb,yjb,null,null));OT.ac();!!$stats&&$stats(tz(Asb,xsb,null,null))} -function yo(a){var b,c,d,e,f;e=($wnd.google&&$wnd.google.gears&&$wnd.google.gears.factory).create(zsb);e.decode(a.b);d=e.width;c=e.height;f=d/a.c.c;b=c/a.c.b;if(f>b){if(f>1){e.resize(a.c.c,~~Math.max(Math.min(c/f,2147483647),-2147483648));Qv(a.d,e.encode());return}Qv(a.d,a.b)}else{if(b>1){e.resize(~~Math.max(Math.min(d/b,2147483647),-2147483648),a.c.b);Qv(a.d,e.encode());return}Qv(a.d,a.b)}} -var Bsb='AsyncLoader2',zsb='beta.canvas',Asb='runCallbacks2';_=HT.prototype=new IT;_.gC=TT;_.ac=XT;_.tI=0;var WP=R4(jqb,Bsb);UT(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/AE48EA5D8ECD3E90C23EBF393DC6958A/3.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/AE48EA5D8ECD3E90C23EBF393DC6958A/3.cache.js deleted file mode 100644 index ccb77e46..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/AE48EA5D8ECD3E90C23EBF393DC6958A/3.cache.js +++ /dev/null @@ -1,35 +0,0 @@ -function vo(){} -function Sv(){} -function Xv(){} -function LT(){} -function IT(){} -function YT(){} -function aU(){} -function Xy(){Sy(Ly)} -function zo(){return JN} -function Wv(){return xO} -function _v(){return yO} -function KT(){return VP} -function $T(){return TP} -function cU(){return UP} -function Sy(a){Py(a,a.e)} -function Uv(a,b){a.b=b;return a} -function Zv(a,b){a.b=b;return a} -function RT(){RT=ncb;OT=new IT} -function _T(a){RT();QT=false;WT(a)} -function TI(a,b){if(!a){return}$v(a,b)} -function Cv(a,b){a8(a.g.b,b)!=null;Gv(a);Fv(a);kt(a.b.e)} -function Pv(a){if(a.i.d){HC((LB(),a.e.K),Csb);VT(xo(new vo,a.b,a))}else{Qv(a,a.b)}} -function tw(a,b,c){var d;d=v2(a.g,b);Vs(a,c,a.K,d,true);Ws(a,b)} -function WI(c,b){c.onprogress=function(a){XI(b,a)}} -function xo(a,b,c){a.b=b;a.d=c;a.c=c.i;return a} -function WT(a){RT();while(MT){_o();_q(ir(new yp,Ksb+Fh(a)));MT=MT.c}NT=null} -function Fv(a){var b;if(a.f.c>0){b=CM(ubb(a.f),37);Pv(b)}else{a.e=false}} -function Py(a,b){var c;c=b==a.e?wjb:xjb+b;Uy(c,xsb,Q5(b),null);if(Ry(a,b)){ez(a.f);a8(a.b,Q5(b));Wy(a)}} -function XI(a,b){var c;if(!a){return}c=b.loaded/b.total;a.b.h.b.db(PM(Math.floor(c*100))+Jsb)} -function SI(c,a){var b=c;c.onreadystatechange=function(){if(b.readyState==4){TI(a,b);b.onreadystatechange=null;b.onprogress=null;b.upload.onprogress=null}}} -function $v(b,c){var a,e,f;if(c.status!=200){HC((LB(),b.b.e.K),Gsb);pk(b.b.bb(),Hsb,true)}(Kv(),Jv).remove(b.b.f);if(c.status==200){try{f=QL(c.responseText);Cv(b.b.j,b.b);cl(b.b.g,b.b,f);return}catch(a){a=IS(a);if(FM(a,23)){e=a;_o();_q(ir(new yp,Isb+Fh(e)+Feb+c.responseText))}else throw a}}a8(b.b.g.b.b,b.b)!=null;Cv(b.b.j,b.b)} -function VT(a){RT();var b;b=new aU;b.b=a;!!NT&&(NT.c=b);NT=b;!MT&&(MT=b);if(PT){OT.ac();return}if(!QT){QT=true;Qy((My(),Ly),2,new YT)}} -function cl(a,b,c){var d,e;a8(a.b.b,b)!=null;e=c.$b();if(e){d=Gt(new vt,a,e,a.c);Y7(a.g,Q5(d.d),d);gab(a.h,d);a.m.b==a&&tw(a.m,b,d)}else{a.m.b==a&&Ws(a.m,b)}} -function Qv(a,b){var c;HC((LB(),a.e.K),Dsb);c=tI().create(Esb);c.open($jb,(_o(),Wo)+a.g.e+Fsb+a.f+pgb+$o);WI(c.upload,Uv(new Sv,a));SI(c,Zv(new Xv,a));c.send(b)} -var Jsb='%',Fsb='?filename=',Psb='AsyncLoader2$1',Qsb='AsyncLoader2__Callback',Osb='AsyncLoader2__Super',Lsb='AsyncResizer',Ksb='Error Resizing image\n',Isb='Exception on Upload\n',Csb='Resizing..',Gsb='Upload Error',Msb='UploadFile$1',Nsb='UploadFile$2',Dsb='Uploading..',Esb='beta.httprequest',xsb='end',Hsb='upload-error';_=vo.prototype=new Pf;_.gC=zo;_.tI=0;_.b=null;_.c=null;_.d=null;_=Sv.prototype=new Pf;_.gC=Wv;_.tI=0;_.b=null;_=Xv.prototype=new Pf;_.gC=_v;_.tI=0;_.b=null;_=IT.prototype=new Pf;_.gC=KT;_.ac=LT;_.tI=0;var MT=null,NT=null,OT,PT=false,QT=false;_=YT.prototype=new Pf;_.gC=$T;_.Pb=_T;_.tI=89;_=aU.prototype=new Pf;_.gC=cU;_.tI=0;_.b=null;_.c=null;var JN=R4(knb,Lsb),xO=R4(knb,Msb),yO=R4(knb,Nsb),VP=R4(jqb,Osb),TP=R4(jqb,Psb),UP=R4(jqb,Qsb);Xy(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/B71911CF996F6E89D496C872F18EA45B/1.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/B71911CF996F6E89D496C872F18EA45B/1.cache.js deleted file mode 100644 index 8e2f4644..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/B71911CF996F6E89D496C872F18EA45B/1.cache.js +++ /dev/null @@ -1,7 +0,0 @@ -function Ug(){} -function Sg(){} -function Zg(){} -function Rg(){} -function Wg(){Wg=kp;Vg=new Sg} -function Yg(){Vg=(Wg(),new Rg);ac((Zb(),Yb),1);!!$stats&&$stats(Cc(vr,wr,null,null));Vg.m();!!$stats&&$stats(Cc(vr,xr,null,null))} -var vr='runCallbacks1';_=Sg.prototype=new O;_.m=Ug;_.tI=0;_=Rg.prototype=new Sg;_.m=Zg;_.tI=0;var Vg;Yg(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/B71911CF996F6E89D496C872F18EA45B/2.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/B71911CF996F6E89D496C872F18EA45B/2.cache.js deleted file mode 100644 index 67eb0f99..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/B71911CF996F6E89D496C872F18EA45B/2.cache.js +++ /dev/null @@ -1,7 +0,0 @@ -function bh(){} -function _g(){} -function gh(){} -function $g(){} -function dh(){dh=kp;ch=new _g} -function fh(){ch=(dh(),new $g);ac((Zb(),Yb),2);!!$stats&&$stats(Cc(yr,wr,null,null));ch.m();!!$stats&&$stats(Cc(yr,xr,null,null))} -var yr='runCallbacks2';_=_g.prototype=new O;_.m=bh;_.tI=0;_=$g.prototype=new _g;_.m=gh;_.tI=0;var ch;fh(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/B71911CF996F6E89D496C872F18EA45B/3.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/B71911CF996F6E89D496C872F18EA45B/3.cache.js deleted file mode 100644 index 75ef7c04..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/B71911CF996F6E89D496C872F18EA45B/3.cache.js +++ /dev/null @@ -1,75 +0,0 @@ -function Xb(){} -function ic(){} -function rc(){} -function uc(){} -function Kc(){} -function Ek(){} -function Dk(){} -function qn(){} -function xn(){} -function Cn(){} -function so(){} -function Do(){} -function Mo(){} -function hc(){cc(Yb)} -function cc(a){ac(a,a.d)} -function yc(a){xc(this,a)} -function nc(a){a.c=0;a.d=0} -function qc(a){return a.d-a.c} -function Jk(){return this.b} -function Kk(){return this.b} -function Co(){return this.c} -function Lo(){return Jo(this)} -function oc(a){return a.b[a.c]} -function mc(a,b){a.b[a.d++]=b} -function tc(a,b){Ed();return a} -function wc(a,b){a.b=b;return a} -function Hk(a,b){a.b=b;return a} -function zn(a,b){a.b=b;return a} -function Gn(){return xo(this,0)} -function wn(){return this.c.b.e} -function pc(a){return a.b[a.c++]} -function An(){return Ym(this.b.b)} -function un(a){return Ml(this.b,a)} -function Ko(){return this.c!=this.e.b} -function Oo(a){a.b=a.c=a;return a} -function Mc(a,b,c){a.c=b;a.b=c;return a} -function sn(a,b,c){a.b=b;a.c=c;return a} -function Bo(a){return Po(new Mo,a,this.b),++this.c,true} -function Ao(a){if(a.c==0){throw dp(new bp)}} -function uo(a){a.b=Oo(new Mo);a.c=0;return a} -function wo(a,b,c){Po(new Mo,b,c);++a.c} -function Go(a,b,c,d){a.e=d;a.c=c;a.b=b;return a} -function Po(a,b,c){a.d=b;a.b=c;a.c=c.c;c.c.b=a;c.c=a;return a} -function lc(a,b){a.b=Uf(vg,0,-1,b,1);return a} -function Ok(){Ok=kp;Nk=Uf(xg,0,12,256,0)} -function Zb(){Zb=kp;Yb=_b(new Xb,3,Vf(vg,0,-1,[]))} -function Cl(a){var b;b=fm(new _l,a);return sn(new qn,a,b)} -function Bn(){var a;a=ig(Zm(this.b.b),20).D();return a} -function vn(){var a;a=om(new mm,this.c.b);return zn(new xn,a)} -function En(a,b){var c;c=xo(this,a);wo(c.e,b,c.c);++c.b;c.d=null} -function yo(a){var b;Ao(a);--a.c;b=a.b.b;b.b.c=b.c;b.c.b=b.b;b.b=b.c=b;return b.d} -function Ik(a){return a!=null&&gg(a.tI,12)&&ig(a,12).b==this.b} -function ec(a,b,c,d){!!$stats&&$stats(Cc(a,b,c,d))} -function Ic(b,c){function d(a){c.i(a)} -return __gwtStartLoadingFragment(b,d)} -function Ml(a,b){if(a.d&&eo(a.c,b)){return true}else if(Ll(a,b)){return true}else if(Jl(a,b)){return true}return false} -function Jo(a){if(a.c==a.e.b){throw dp(new bp)}a.d=a.c;a.c=a.c.b;++a.b;return a.d.d} -function _b(a,b,c){Zb();a.b=co(new ao);a.g=uo(new so);a.d=b;a.c=c;a.f=lc(new ic,b+1);return a} -function hk(c,a){var b=c;c.onreadystatechange=$entry(function(){a.j(b)})} -function Ll(e,a){var b=e.f;for(var c in b){if(c.charCodeAt(0)==58){var d=b[c];if(e.B(a,d)){return true}}}return false} -function Jl(i,a){var b=i.b;for(var c in b){if(c==parseInt(c)){var d=b[c];for(var e=0,f=d.length;e-129&&a<128){b=a+128;c=(Ok(),Nk)[b];!c&&(c=Nk[b]=Hk(new Dk,a));return c}return Hk(new Dk,a)} -function xo(a,b){var c,d;(b<0||b>a.c)&&Sm(b,a.c);if(b>=a.c>>1){d=a.b;for(c=a.c;c>b;--c){d=d.c}}else{d=a.b.b;for(c=0;c0){Ln(h,ig(yo(b.b.g),2));pc(b.b.f)}nc(b.b.f);Nn(h,Cl(b.b.b));Il(b.b.b);i=null;for(g=Xm(new Um,h);g.b1){return}if(qc(a.e)>0){c=oc(a.e);ec(c==a.d?zr:Ar+c,wr,Lk(c),null);Jc(c,wc(new uc,a));return}while(qc(a.f)>0){c=pc(a.f);b=ig(yo(a.g),2);ec(c==a.d?zr:Ar+c,wr,Lk(c),null);Jc(c,b)}} -var Fr="Can't get element ",Cr='GET',Dr='MSXML2.XMLHTTP.3.0',Er='Microsoft.XMLHTTP',wr='begin',Ar='download',xr='end',zr='leftoversDownload',Br='runAsync';_=Xb.prototype=new O;_.tI=0;_.c=null;_.d=0;_.e=null;_.f=null;var Yb;_=ic.prototype=new O;_.tI=0;_.b=null;_.c=0;_.d=0;_=rc.prototype=new mb;_.tI=7;_=uc.prototype=new O;_.i=yc;_.tI=8;_.b=null;_=Kc.prototype=new O;_.j=Nc;_.tI=0;_.b=null;_.c=null;_=Ek.prototype=new O;_.tI=27;_=Dk.prototype=new Ek;_.eQ=Ik;_.hC=Jk;_.w=Kk;_.tI=30;_.b=0;var Nk;_=qn.prototype=new rl;_.y=un;_.s=vn;_.z=wn;_.tI=0;_.b=null;_.c=null;_=xn.prototype=new O;_.u=An;_.v=Bn;_.tI=0;_.b=null;_=Cn.prototype=new Km;_.F=En;_.G=Fn;_.s=Gn;_.tI=41;_=so.prototype=new Cn;_.x=Bo;_.z=Co;_.tI=45;_.b=null;_.c=0;_=Do.prototype=new O;_.u=Ko;_.v=Lo;_.tI=0;_.b=0;_.c=null;_.d=null;_.e=null;_=Mo.prototype=new O;_.tI=0;_.b=null;_.c=null;_.d=null;var vg=new ok,xg=new ok;hc(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/C0A3E821CD3689650D1DF0CEF5C506A9/1.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/C0A3E821CD3689650D1DF0CEF5C506A9/1.cache.js deleted file mode 100644 index e7aadde5..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/C0A3E821CD3689650D1DF0CEF5C506A9/1.cache.js +++ /dev/null @@ -1,7 +0,0 @@ -function $S(){} -function kT(){return EP} -function oT(){var a;while(dT){a=dT;dT=dT.b;!dT&&(eT=null);Wv(a.a.a)}} -function vv(a,b){mbb(a.e,b);if(!a.d){a.d=true;wv(a)}a.b=false;xv(a)} -function Wv(a){var b;a.a.a=a.a.b.blob;(Bv(),Av).captureBlob(a.a.a,a.a.e,rsb);b=G_(new D_,a.a.e);a.a.c.rb(b);vv(a.a.i,a.a)} -function lT(){gT=true;fT=(iT(),new $S);Jy((Gy(),Fy),1);!!$stats&&$stats(nz(ssb,mjb,null,null));fT.Zb();!!$stats&&$stats(nz(ssb,tsb,null,null))} -var usb='AsyncLoader1',rsb='image/JPEG',ssb='runCallbacks1';_=$S.prototype=new _S;_.gC=kT;_.Zb=oT;_.tI=0;var EP=M4(bqb,usb);lT(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/C0A3E821CD3689650D1DF0CEF5C506A9/2.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/C0A3E821CD3689650D1DF0CEF5C506A9/2.cache.js deleted file mode 100644 index d7319b98..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/C0A3E821CD3689650D1DF0CEF5C506A9/2.cache.js +++ /dev/null @@ -1,6 +0,0 @@ -function wT(){} -function IT(){return IP} -function MT(){var a;while(BT){a=BT;BT=BT.b;!BT&&(CT=null);qo(a.a)}} -function JT(){ET=true;DT=(GT(),new wT);Jy((Gy(),Fy),2);!!$stats&&$stats(nz(wsb,mjb,null,null));DT.Zb();!!$stats&&$stats(nz(wsb,tsb,null,null))} -function qo(a){var b,c,d,e,f;e=($wnd.google&&$wnd.google.gears&&$wnd.google.gears.factory).create(vsb);e.decode(a.a);d=e.width;c=e.height;f=d/a.b.b;b=c/a.b.a;if(f>b){if(f>1){e.resize(a.b.b,~~Math.max(Math.min(c/f,2147483647),-2147483648));Hv(a.c,e.encode());return}Hv(a.c,a.a)}else{if(b>1){e.resize(~~Math.max(Math.min(d/b,2147483647),-2147483648),a.b.a);Hv(a.c,e.encode());return}Hv(a.c,a.a)}} -var xsb='AsyncLoader2',vsb='beta.canvas',wsb='runCallbacks2';_=wT.prototype=new xT;_.gC=IT;_.Zb=MT;_.tI=0;var IP=M4(bqb,xsb);JT(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/C0A3E821CD3689650D1DF0CEF5C506A9/3.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/C0A3E821CD3689650D1DF0CEF5C506A9/3.cache.js deleted file mode 100644 index cdd183e1..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/C0A3E821CD3689650D1DF0CEF5C506A9/3.cache.js +++ /dev/null @@ -1,35 +0,0 @@ -function no(){} -function Jv(){} -function Ov(){} -function AT(){} -function xT(){} -function NT(){} -function RT(){} -function Ry(){My(Fy)} -function ro(){return yN} -function Nv(){return mO} -function Sv(){return nO} -function zT(){return HP} -function PT(){return FP} -function TT(){return GP} -function My(a){Jy(a,a.d)} -function Lv(a,b){a.a=b;return a} -function Qv(a,b){a.a=b;return a} -function GT(){GT=hcb;DT=new xT} -function QT(a){GT();FT=false;LT(a)} -function KI(a,b){if(!a){return}Rv(a,b)} -function NI(c,b){c.onprogress=function(a){OI(b,a)}} -function kw(a,b,c){var d;d=L2(a.f,b);Ms(a,c,a.H,d,true);Ns(a,b)} -function po(a,b,c){a.a=b;a.c=c;a.b=c.h;return a} -function wv(a){var b;if(a.e.b>0){b=tM(obb(a.e),37);Gv(b)}else{a.d=false}} -function tv(a,b){W7(a.f.a,b)!=null;xv(a);wv(a);bt(a.a.d)} -function OI(a,b){var c;if(!a){return}c=b.loaded/b.total;a.a.g.a.ab(GM(Math.floor(c*100))+Fsb)} -function Jy(a,b){var c;c=b==a.d?kjb:ljb+b;Oy(c,tsb,L5(b),null);if(Ly(a,b)){$y(a.e);W7(a.a,L5(b));Qy(a)}} -function Gv(a){if(a.h.c){(zB(),a.d.H).innerText=ysb;KT(po(new no,a.a,a))}else{Hv(a,a.a)}} -function LT(a){GT();while(BT){To();Sq(_q(new qp,Gsb+Dh(a)));BT=BT.b}CT=null} -function KT(a){GT();var b;b=new RT;b.a=a;!!CT&&(CT.b=b);CT=b;!BT&&(BT=b);if(ET){DT.Zb();return}if(!FT){FT=true;Ky((Gy(),Fy),2,new NT)}} -function Wk(a,b,c){var d,e;W7(a.a.a,b)!=null;e=c.Xb();if(e){d=xt(new mt,a,e,a.b);S7(a.f,L5(d.c),d);aab(a.g,d);a.l.a==a&&kw(a.l,b,d)}else{a.l.a==a&&Ns(a.l,b)}} -function Rv(b,c){var a,e,f;if(c.status!=200){(zB(),b.a.d.H).innerText=Csb;hk(b.a.$(),Dsb,true)}(Bv(),Av).remove(b.a.e);if(c.status==200){try{f=HL(c.responseText);tv(b.a.i,b.a);Wk(b.a.f,b.a,f);return}catch(a){a=xS(a);if(wM(a,23)){e=a;To();Sq(_q(new qp,Esb+Dh(e)+teb+c.responseText))}else throw a}}W7(b.a.f.a.a,b.a)!=null;tv(b.a.i,b.a)} -function JI(c,a){var b=c;c.onreadystatechange=function(){if(b.readyState==4){KI(a,b);b.onreadystatechange=null;b.onprogress=null;b.upload.onprogress=null}}} -function Hv(a,b){var c;(zB(),a.d.H).innerText=zsb;c=kI().create(Asb);c.open(Jjb,(To(),Oo)+a.f.d+Bsb+a.e+fgb+So);NI(c.upload,Lv(new Jv,a));JI(c,Qv(new Ov,a));c.send(b)} -var Fsb='%',Bsb='?filename=',Lsb='AsyncLoader2$1',Msb='AsyncLoader2__Callback',Ksb='AsyncLoader2__Super',Hsb='AsyncResizer',Gsb='Error Resizing image\n',Esb='Exception on Upload\n',ysb='Resizing..',Csb='Upload Error',Isb='UploadFile$1',Jsb='UploadFile$2',zsb='Uploading..',Asb='beta.httprequest',tsb='end',Dsb='upload-error';_=no.prototype=new Nf;_.gC=ro;_.tI=0;_.a=null;_.b=null;_.c=null;_=Jv.prototype=new Nf;_.gC=Nv;_.tI=0;_.a=null;_=Ov.prototype=new Nf;_.gC=Sv;_.tI=0;_.a=null;_=xT.prototype=new Nf;_.gC=zT;_.Zb=AT;_.tI=0;var BT=null,CT=null,DT,ET=false,FT=false;_=NT.prototype=new Nf;_.gC=PT;_.Mb=QT;_.tI=89;_=RT.prototype=new Nf;_.gC=TT;_.tI=0;_.a=null;_.b=null;var yN=M4(fnb,Hsb),mO=M4(fnb,Isb),nO=M4(fnb,Jsb),HP=M4(bqb,Ksb),FP=M4(bqb,Lsb),GP=M4(bqb,Msb);Ry(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/1.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/1.cache.js new file mode 100644 index 00000000..ad849765 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/1.cache.js @@ -0,0 +1,7 @@ +function LU(){} +function XU(){return sR} +function _U(){var a;while(QU){a=QU;QU=QU.c;!QU&&(RU=null);Rw(a.b.b)}} +function pw(a,b){Ucb(a.f,b);if(!a.e){a.e=true;rw(a)}a.c=false;sw(a)} +function Rw(a){var b;a.b.b=a.b.c.blob;(ww(),vw).captureBlob(a.b.b,a.b.f,mub);b=T0(new Q0,a.b.f);a.b.d.ub(b);pw(a.b.j,a.b)} +function YU(){TU=true;SU=(VU(),new LU);fA((cA(),bA),1);!!$stats&&$stats(LA(nub,elb,null,null));SU.ac();!!$stats&&$stats(LA(nub,oub,null,null))} +var pub='AsyncLoader1',mub='image/JPEG',nub='runCallbacks1';_=LU.prototype=new MU;_.gC=XU;_.ac=_U;_.tI=0;var sR=s6(asb,pub);YU(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/2.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/2.cache.js new file mode 100644 index 00000000..e48dfe65 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/2.cache.js @@ -0,0 +1,6 @@ +function hV(){} +function tV(){return wR} +function xV(){var a;while(mV){a=mV;mV=mV.c;!mV&&(nV=null);Jo(a.b)}} +function uV(){pV=true;oV=(rV(),new hV);fA((cA(),bA),2);!!$stats&&$stats(LA(rub,elb,null,null));oV.ac();!!$stats&&$stats(LA(rub,oub,null,null))} +function Jo(a){var b,c,d,e,f;e=($wnd.google&&$wnd.google.gears&&$wnd.google.gears.factory).create(qub);e.decode(a.b);d=e.width;c=e.height;f=d/a.c.c;b=c/a.c.b;if(f>b){if(f>1){e.resize(a.c.c,~~Math.max(Math.min(c/f,2147483647),-2147483648));Cw(a.d,e.encode());return}Cw(a.d,a.b)}else{if(b>1){e.resize(~~Math.max(Math.min(d/b,2147483647),-2147483648),a.c.b);Cw(a.d,e.encode());return}Cw(a.d,a.b)}} +var sub='AsyncLoader2',qub='beta.canvas',rub='runCallbacks2';_=hV.prototype=new iV;_.gC=tV;_.ac=xV;_.tI=0;var wR=s6(asb,sub);uV(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/3.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/3.cache.js new file mode 100644 index 00000000..5f8c4d35 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/CE15F73DB4EDED1CF8F93F95A728792D/3.cache.js @@ -0,0 +1,35 @@ +function Go(){} +function Ew(){} +function Jw(){} +function lV(){} +function iV(){} +function yV(){} +function CV(){} +function nA(){iA(bA)} +function Ko(){return $O} +function Iw(){return TP} +function Nw(){return UP} +function kV(){return vR} +function AV(){return tR} +function EV(){return uR} +function iA(a){fA(a,a.e)} +function Gw(a,b){a.b=b;return a} +function Lw(a,b){a.b=b;return a} +function rV(){rV=Pdb;oV=new iV} +function BV(a){rV();qV=false;wV(a)} +function iK(a,b){if(!a){return}Mw(a,b)} +function lK(c,b){c.onprogress=function(a){mK(b,a)}} +function Io(a,b,c){a.b=b;a.d=c;a.c=c.i;return a} +function gx(a,b,c){var d;d=Y3(a.g,b);Bt(a,c,a.K,d,true);Ct(a,b)} +function nw(a,b){C9(a.g.b,b)!=null;sw(a);rw(a);St(a.b.f)} +function Bw(a){if(a.i.d){YD((aD(),a.e.K),tub);vV(Io(new Go,a.b,a))}else{Cw(a,a.b)}} +function wV(a){rV();while(mV){kr();qq(Mr(new Kr,Cub+Qh(a)));mV=mV.c}nV=null} +function mK(a,b){var c;if(!a){return}c=b.loaded/b.total;a.b.h.b.db(eO(Math.floor(c*100))+Bub)} +function fA(a,b){var c;c=b==a.e?clb:dlb+b;kA(c,oub,r7(b),null);if(hA(a,b)){wA(a.f);C9(a.b,r7(b));mA(a)}} +function rw(a){var b;if(a.f.c>0){b=TN(Wcb(a.f),37);Bw(b)}else{a.e=false}} +function vV(a){rV();var b;b=new CV;b.b=a;!!nV&&(nV.c=b);nV=b;!mV&&(mV=b);if(pV){oV.ac();return}if(!qV){qV=true;gA((cA(),bA),2,new yV)}} +function nl(a,b,c){var d,e;C9(a.b.b,b)!=null;e=c.$b();if(e){d=mu(new bu,a,e,a.c);y9(a.g,r7(d.d),d);Ibb(a.h,d);a.m.b==a&&gx(a.m,b,d)}else{a.m.b==a&&Ct(a.m,b)}} +function Mw(b,c){var a,e,f;if(c.status!=200){YD((aD(),b.b.e.K),xub);Ak(b.b.bb(),yub,true);kr();qq(Mr(new Kr,zub+c.responseText))}(ww(),vw).remove(b.b.f);if(c.status==200){try{f=fN(c.responseText);nw(b.b.j,b.b);nl(b.b.g,b.b,f);return}catch(a){a=iU(a);if(WN(a,23)){e=a;kr();qq(Mr(new Kr,Aub+Qh(e)+fgb+c.responseText))}else throw a}}C9(b.b.g.b.b,b.b)!=null;nw(b.b.j,b.b)} +function hK(c,a){var b=c;c.onreadystatechange=function(){if(b.readyState==4){iK(a,b);b.onreadystatechange=null;b.onprogress=null;b.upload.onprogress=null}}} +function Cw(a,b){var c;YD((aD(),a.e.K),uub);c=KJ().create(vub);c.open(Glb,(kr(),fr)+a.g.e+wub+a.f+hib+jr);lK(c.upload,Gw(new Ew,a));hK(c,Lw(new Jw,a));c.send(b)} +var Bub='%',wub='?filename=',Hub='AsyncLoader2$1',Iub='AsyncLoader2__Callback',Gub='AsyncLoader2__Super',Dub='AsyncResizer',Cub='Error Resizing image\n',zub='Error Uploading\n',Aub='Exception on Upload\n',tub='Resizing..',xub='Upload Error',Eub='UploadFile$1',Fub='UploadFile$2',uub='Uploading..',vub='beta.httprequest',oub='end',yub='upload-error';_=Go.prototype=new $f;_.gC=Ko;_.tI=0;_.b=null;_.c=null;_.d=null;_=Ew.prototype=new $f;_.gC=Iw;_.tI=0;_.b=null;_=Jw.prototype=new $f;_.gC=Nw;_.tI=0;_.b=null;_=iV.prototype=new $f;_.gC=kV;_.ac=lV;_.tI=0;var mV=null,nV=null,oV,pV=false,qV=false;_=yV.prototype=new $f;_.gC=AV;_.Pb=BV;_.tI=95;_=CV.prototype=new $f;_.gC=EV;_.tI=0;_.b=null;_.c=null;var $O=s6(Sob,Dub),TP=s6(Sob,Eub),UP=s6(Sob,Fub),vR=s6(asb,Gub),tR=s6(asb,Hub),uR=s6(asb,Iub);nA(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/1.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/1.cache.js new file mode 100644 index 00000000..2bd71e07 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/1.cache.js @@ -0,0 +1,9 @@ +function ZQ(){} +function WQ(){} +function dR(){} +function VQ(){} +function bR(){return AN} +function YQ(){return zN} +function _Q(){_Q=Y9;$Q=new WQ} +function cR(){$Q=(_Q(),new VQ);yx((vx(),ux),1);!!$stats&&$stats(cy(Vpb,Wpb,null,null));$Q.Sb();!!$stats&&$stats(cy(Vpb,Xpb,null,null))} +var $pb='AsyncLoader1',Zpb='AsyncLoader1__Super',Vpb='runCallbacks1';_=WQ.prototype=new Ef;_.gC=YQ;_.Sb=ZQ;_.tI=0;_=VQ.prototype=new WQ;_.gC=bR;_.Sb=dR;_.tI=0;var $Q;var zN=D2(Ypb,Zpb),AN=D2(Ypb,$pb);cR(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/2.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/2.cache.js new file mode 100644 index 00000000..1263b2b5 --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/2.cache.js @@ -0,0 +1,9 @@ +function iR(){} +function fR(){} +function oR(){} +function eR(){} +function mR(){return CN} +function hR(){return BN} +function kR(){kR=Y9;jR=new fR} +function nR(){jR=(kR(),new eR);yx((vx(),ux),2);!!$stats&&$stats(cy(_pb,Wpb,null,null));jR.Sb();!!$stats&&$stats(cy(_pb,Xpb,null,null))} +var bqb='AsyncLoader2',aqb='AsyncLoader2__Super',_pb='runCallbacks2';_=fR.prototype=new Ef;_.gC=hR;_.Sb=iR;_.tI=0;_=eR.prototype=new fR;_.gC=mR;_.Sb=oR;_.tI=0;var jR;var BN=D2(Ypb,aqb),CN=D2(Ypb,bqb);nR(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/3.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/3.cache.js new file mode 100644 index 00000000..cfb339de --- /dev/null +++ b/modules/gwtorganise/war/g3viewer/deferredjs/D096B0ED44CBABF1A6B1F2C2D31F4FCC/3.cache.js @@ -0,0 +1,54 @@ +function tx(){} +function Hx(){} +function Rx(){} +function Vx(){} +function ky(){} +function t7(){} +function B7(){} +function Fx(){Ax(ux)} +function Gx(){return DM} +function Qx(){return zM} +function Ux(){return AM} +function Zx(){return BM} +function ny(){return CM} +function y7(){return MP} +function E7(){return LP} +function Ax(a){yx(a,a.c)} +function $x(a){Yx(this,a)} +function Mx(a){a.b=0;a.c=0} +function Px(a){return a.c-a.b} +function z3(){return this.a} +function Nx(a){return a.a[a.b]} +function Lx(a,b){a.a[a.c++]=b} +function Xx(a,b){a.a=b;return a} +function D7(a,b){a.a=b;return a} +function Ox(a){return a.a[a.b++]} +function A7(){return this.b.a.d} +function F7(){return Y6(this.a.a)} +function x7(a){return C5(this.a,a)} +function f9(a){if(a.b==0){throw Q9(new O9)}} +function v7(a,b,c){a.a=b;a.b=c;return a} +function my(a,b,c){a.b=b;a.a=c;return a} +function Tx(a,b){kz(a);a.f=eqb+b;return a} +function Kx(a,b){a.a=hK(_P,0,-1,b,1);return a} +function p5(a){var b;b=Z5(new S5,a);return v7(new t7,a,b)} +function d9(a){var b;f9(a);--a.b;b=a.a.a;z9(b);return b.c} +function G7(){var a;a=xK(Z6(this.a.a),61).hc();return a} +function z7(){var a;a=h6(new f6,this.b.a);return D7(new B7,a)} +function Cx(a,b,c,d){!!$stats&&$stats(cy(a,b,c,d))} +function iy(b,c){function d(a){c.Gb(a)} +return __gwtStartLoadingFragment(b,d)} +function C5(a,b){if(a.c&&H8(a.b,b)){return true}else if(B5(a,b)){return true}else if(z5(a,b)){return true}return false} +function xx(a,b,c){vx();a.a=F8(new D8);a.f=_8(new Z8);a.c=b;a.b=c;a.e=Kx(new Hx,b+1);return a} +function vx(){vx=Y9;ux=xx(new tx,3,iK(_P,0,-1,[]))} +function jy(a,b){var c,d;c=iy(a,b);if(c==null){return}d=g2();d.open(bhb,c,true);e2(d,my(new ky,d,b));d.send(null)} +function zx(a,b){var c,d,e,f;if(b==a.c){return true}for(d=a.b,e=0,f=d.length;e0){S7(h,xK(d9(b.a.f),41));Ox(b.a.e)}Mx(b.a.e);U7(h,p5(b.a.a));y5(b.a.a);i=null;for(g=X6(new U6,h);g.a1){return}if(Px(a.d)>0){c=Nx(a.d);Cx(c==a.c?cqb:dqb+c,Wpb,C3(c),null);jy(c,Xx(new Vx,a));return}while(Px(a.e)>0){c=Ox(a.e);b=xK(d9(a.f),41);Cx(c==a.c?cqb:dqb+c,Wpb,C3(c),null);jy(c,b)}} +var mqb='AbstractMap$2',nqb='AbstractMap$2$1',hqb='AsyncFragmentLoader',iqb='AsyncFragmentLoader$BoundedIntQueue',jqb='AsyncFragmentLoader$HttpDownloadFailure',kqb='AsyncFragmentLoader$InitialFragmentDownloadFailed',lqb='AsyncFragmentLoader$XhrLoadingStrategy$1',eqb='HTTP download failed with status ',gqb='[I',Wpb='begin',Ypb='com.google.gwt.lang.asyncloaders.',dqb='download',Xpb='end',cqb='leftoversDownload',fqb='runAsync';_=tx.prototype=new Ef;_.gC=Gx;_.tI=0;_.b=null;_.c=0;_.d=null;_.e=null;var ux;_=Hx.prototype=new Ef;_.gC=Qx;_.tI=0;_.a=null;_.b=0;_.c=0;_=Rx.prototype=new nw;_.gC=Ux;_.tI=76;_=Vx.prototype=new Ef;_.gC=Zx;_.Gb=$x;_.tI=77;_.a=null;_=ky.prototype=new Ef;_.gC=ny;_.Hb=oy;_.tI=0;_.a=null;_.b=null;_=r3.prototype;_.ac=z3;_=t7.prototype=new a5;_.cc=x7;_.gC=y7;_.nb=z7;_.dc=A7;_.tI=0;_.a=null;_.b=null;_=B7.prototype=new Ef;_.gC=E7;_.Tb=F7;_.Ub=G7;_.tI=0;_.a=null;var _P=C2(_bb,gqb),DM=D2(Bmb,hqb),zM=D2(Bmb,iqb),AM=D2(Bmb,jqb),BM=D2(Bmb,kqb),CM=D2(Bmb,lqb),MP=D2(Ckb,mqb),LP=D2(Ckb,nqb);Fx(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/DB10FC871F1917C3CF43B2E1A192D050/1.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/DB10FC871F1917C3CF43B2E1A192D050/1.cache.js deleted file mode 100644 index fba0896d..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/DB10FC871F1917C3CF43B2E1A192D050/1.cache.js +++ /dev/null @@ -1,7 +0,0 @@ -function Yg(){} -function Wg(){} -function bh(){} -function Vg(){} -function $g(){$g=mp;Zg=new Wg} -function ah(){Zg=($g(),new Vg);ac((Zb(),Yb),1);!!$stats&&$stats(Cc(ur,vr,null,null));Zg.m();!!$stats&&$stats(Cc(ur,wr,null,null))} -var ur='runCallbacks1';_=Wg.prototype=new O;_.m=Yg;_.tI=0;_=Vg.prototype=new Wg;_.m=bh;_.tI=0;var Zg;ah(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/DB10FC871F1917C3CF43B2E1A192D050/2.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/DB10FC871F1917C3CF43B2E1A192D050/2.cache.js deleted file mode 100644 index 45a9b6c3..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/DB10FC871F1917C3CF43B2E1A192D050/2.cache.js +++ /dev/null @@ -1,7 +0,0 @@ -function fh(){} -function dh(){} -function kh(){} -function ch(){} -function hh(){hh=mp;gh=new dh} -function jh(){gh=(hh(),new ch);ac((Zb(),Yb),2);!!$stats&&$stats(Cc(xr,vr,null,null));gh.m();!!$stats&&$stats(Cc(xr,wr,null,null))} -var xr='runCallbacks2';_=dh.prototype=new O;_.m=fh;_.tI=0;_=ch.prototype=new dh;_.m=kh;_.tI=0;var gh;jh(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/deferredjs/DB10FC871F1917C3CF43B2E1A192D050/3.cache.js b/modules/gwtorganise/war/g3viewer/deferredjs/DB10FC871F1917C3CF43B2E1A192D050/3.cache.js deleted file mode 100644 index 9fe4efc2..00000000 --- a/modules/gwtorganise/war/g3viewer/deferredjs/DB10FC871F1917C3CF43B2E1A192D050/3.cache.js +++ /dev/null @@ -1,75 +0,0 @@ -function Xb(){} -function ic(){} -function rc(){} -function uc(){} -function Kc(){} -function Gk(){} -function Fk(){} -function sn(){} -function zn(){} -function En(){} -function uo(){} -function Fo(){} -function Oo(){} -function hc(){cc(Yb)} -function cc(a){ac(a,a.d)} -function yc(a){xc(this,a)} -function nc(a){a.c=0;a.d=0} -function qc(a){return a.d-a.c} -function Lk(){return this.b} -function Mk(){return this.b} -function Eo(){return this.c} -function No(){return Lo(this)} -function oc(a){return a.b[a.c]} -function mc(a,b){a.b[a.d++]=b} -function tc(a,b){Dd();return a} -function wc(a,b){a.b=b;return a} -function Jk(a,b){a.b=b;return a} -function Bn(a,b){a.b=b;return a} -function In(){return zo(this,0)} -function yn(){return this.c.b.e} -function pc(a){return a.b[a.c++]} -function Cn(){return $m(this.b.b)} -function wn(a){return Ol(this.b,a)} -function Mo(){return this.c!=this.e.b} -function Qo(a){a.b=a.c=a;return a} -function Mc(a,b,c){a.c=b;a.b=c;return a} -function un(a,b,c){a.b=b;a.c=c;return a} -function Do(a){return Ro(new Oo,a,this.b),++this.c,true} -function Co(a){if(a.c==0){throw fp(new dp)}} -function wo(a){a.b=Qo(new Oo);a.c=0;return a} -function yo(a,b,c){Ro(new Oo,b,c);++a.c} -function Io(a,b,c,d){a.e=d;a.c=c;a.b=b;return a} -function Ro(a,b,c){a.d=b;a.b=c;a.c=c.c;c.c.b=a;c.c=a;return a} -function lc(a,b){a.b=Yf(zg,0,-1,b,1);return a} -function Qk(){Qk=mp;Pk=Yf(Bg,0,12,256,0)} -function Zb(){Zb=mp;Yb=_b(new Xb,3,Zf(zg,0,-1,[]))} -function El(a){var b;b=hm(new bm,a);return un(new sn,a,b)} -function Dn(){var a;a=mg(_m(this.b.b),20).D();return a} -function xn(){var a;a=qm(new om,this.c.b);return Bn(new zn,a)} -function Gn(a,b){var c;c=zo(this,a);yo(c.e,b,c.c);++c.b;c.d=null} -function Ao(a){var b;Co(a);--a.c;b=a.b.b;b.b.c=b.c;b.c.b=b.b;b.b=b.c=b;return b.d} -function Kk(a){return a!=null&&kg(a.tI,12)&&mg(a,12).b==this.b} -function ec(a,b,c,d){!!$stats&&$stats(Cc(a,b,c,d))} -function Ic(b,c){function d(a){c.i(a)} -return __gwtStartLoadingFragment(b,d)} -function Ol(a,b){if(a.d&&go(a.c,b)){return true}else if(Nl(a,b)){return true}else if(Ll(a,b)){return true}return false} -function Lo(a){if(a.c==a.e.b){throw fp(new dp)}a.d=a.c;a.c=a.c.b;++a.b;return a.d.d} -function _b(a,b,c){Zb();a.b=fo(new co);a.g=wo(new uo);a.d=b;a.c=c;a.f=lc(new ic,b+1);return a} -function ac(a,b){var c;c=b==a.d?yr:zr+b;ec(c,wr,Nk(b),null);if(bc(a,b)){pc(a.e);Yl(a.b,Nk(b));gc(a)}} -function Jc(a,b){var c,d;c=Ic(a,b);if(c==null){return}d=kk();d.open(Br,c,true);jk(d,Mc(new Kc,d,b));d.send(null)} -function dk(b){var a=b;$wnd.setTimeout(function(){a.onreadystatechange=new Function},0)} -function jk(c,a){var b=c;c.onreadystatechange=$entry(function(){a.j(b)})} -function Hn(b){var a,d;d=zo(this,b);try{return Lo(d)}catch(a){a=Lg(a);if(pg(a,23)){throw Ek(new Bk,Er+b)}else throw a}} -function Nl(e,a){var b=e.f;for(var c in b){if(c.charCodeAt(0)==58){var d=b[c];if(e.B(a,d)){return true}}}return false} -function Ll(i,a){var b=i.b;for(var c in b){if(c==parseInt(c)){var d=b[c];for(var e=0,f=d.length;ea.c)&&Um(b,a.c);if(b>=a.c>>1){d=a.b;for(c=a.c;c>b;--c){d=d.c}}else{d=a.b.b;for(c=0;c-129&&a<128){b=a+128;c=(Qk(),Pk)[b];!c&&(c=Pk[b]=Jk(new Fk,a));return c}return Jk(new Fk,a)} -function kk(){if($wnd.XMLHttpRequest){return new XMLHttpRequest}else{try{return new ActiveXObject(Cr)}catch(a){return new ActiveXObject(Dr)}}} -function xc(b,c){var a,e,f,g,h,i;h=Mn(new Jn);while(qc(b.b.f)>0){Nn(h,mg(Ao(b.b.g),2));pc(b.b.f)}nc(b.b.f);Pn(h,El(b.b.b));Kl(b.b.b);i=null;for(g=Zm(new Wm,h);g.b1){return}if(qc(a.e)>0){c=oc(a.e);ec(c==a.d?yr:zr+c,vr,Nk(c),null);Jc(c,wc(new uc,a));return}while(qc(a.f)>0){c=pc(a.f);b=mg(Ao(a.g),2);ec(c==a.d?yr:zr+c,vr,Nk(c),null);Jc(c,b)}} -var Er="Can't get element ",Br='GET',Cr='MSXML2.XMLHTTP.3.0',Dr='Microsoft.XMLHTTP',vr='begin',zr='download',wr='end',yr='leftoversDownload',Ar='runAsync';_=Xb.prototype=new O;_.tI=0;_.c=null;_.d=0;_.e=null;_.f=null;var Yb;_=ic.prototype=new O;_.tI=0;_.b=null;_.c=0;_.d=0;_=rc.prototype=new mb;_.tI=7;_=uc.prototype=new O;_.i=yc;_.tI=8;_.b=null;_=Kc.prototype=new O;_.j=Nc;_.tI=0;_.b=null;_.c=null;_=Gk.prototype=new O;_.tI=27;_=Fk.prototype=new Gk;_.eQ=Kk;_.hC=Lk;_.w=Mk;_.tI=30;_.b=0;var Pk;_=sn.prototype=new tl;_.y=wn;_.s=xn;_.z=yn;_.tI=0;_.b=null;_.c=null;_=zn.prototype=new O;_.u=Cn;_.v=Dn;_.tI=0;_.b=null;_=En.prototype=new Mm;_.F=Gn;_.G=Hn;_.s=In;_.tI=41;_=uo.prototype=new En;_.x=Do;_.z=Eo;_.tI=45;_.b=null;_.c=0;_=Fo.prototype=new O;_.u=Mo;_.v=No;_.tI=0;_.b=0;_.c=null;_.d=null;_.e=null;_=Oo.prototype=new O;_.tI=0;_.b=null;_.c=null;_.d=null;var zg=new qk,Bg=new qk;hc(); \ No newline at end of file diff --git a/modules/gwtorganise/war/g3viewer/g3viewer.nocache.js b/modules/gwtorganise/war/g3viewer/g3viewer.nocache.js index 64aa42ab..8ef094fe 100644 --- a/modules/gwtorganise/war/g3viewer/g3viewer.nocache.js +++ b/modules/gwtorganise/war/g3viewer/g3viewer.nocache.js @@ -1,4 +1,4 @@ -function g3viewer(){var M='',nb='" for "gwt:onLoadErrorFn"',lb='" for "gwt:onPropertyErrorFn"',Y='"><\/script>',$='#',Wb='.cache.html',ab='/',Lb='015D751F4204508258E3AD3E74E19E72',Mb='0A21C4AA9FA3F1812B8077A68729DA52',Nb='0AB3C6DF30C08F43EAA999A9F920C30B',Ob='3295227D4A416F64C8B3061D11DFABA0',Pb='371B2293E0881C8A53FDA41CA333A843',Qb='46E36699DD51342BCC1877A718D3B6D5',Rb='826A0FAD0C07BC304C641864F5274BFC',gc=' + +
+

+

+ +

+

+

+ +

+

+ +

+ +
+
+
+

+
+
    + +
+
+
+
+
+
" method="post"> + +
+ Save +
diff --git a/modules/moduleorder/views/admin_moduleorder_blocks.html.php b/modules/moduleorder/views/admin_moduleorder_blocks.html.php new file mode 100644 index 00000000..43735a87 --- /dev/null +++ b/modules/moduleorder/views/admin_moduleorder_blocks.html.php @@ -0,0 +1,9 @@ + + + $text): ?> + +
    • + +
    • + + diff --git a/modules/moduleupdates/controllers/admin_moduleupdates.php b/modules/moduleupdates/controllers/admin_moduleupdates.php new file mode 100644 index 00000000..ba812515 --- /dev/null +++ b/modules/moduleupdates/controllers/admin_moduleupdates.php @@ -0,0 +1,137 @@ + + */ + public function index() { + $view = new Admin_View("admin.html"); + $view->page_title = t("Gallery 3 :: Manage Module Updates"); + $view->content = new View("admin_moduleupdates.html"); + + $all_modules = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS); + + foreach (module::available() as $this_module_name => $module_info) { + + $remote_version = ''; + $remote_server = ''; + + list ($remote_version, $remote_server) = $this->get_remote_module_version($this_module_name); + + $font_color = "black"; + if ($remote_version == "DNE") { + $font_color = "blue"; + } else if ($module_info->version != '' and $module_info->code_version < $module_info->version) { + $font_color = "pink"; + } else if ($module_info->version != '' and $module_info->code_version > $module_info->version) { + $font_color = "orange"; + } else if ($remote_version < $module_info->code_version or ($module_info->version != '' and $remote_version < $module_info->version)) { + $font_color = "green"; + } else if ($remote_version > $module_info->code_version or ($module_info->version != '' and $remote_version > $module_info->version)) { + $font_color = "red"; + } + + $all_modules->$this_module_name = array ("name" => $module_info->name, "locked" => $module_info->locked, + "code_version" => $module_info->code_version, "active" => $module_info->active, + "version" => $module_info->version,"description" => $module_info->description, + "remote_version" => $remote_version, "remote_server" => $remote_server, "font_color" => $font_color); + } + + $view->content->vars = $all_modules; + + print $view; + } + + + /** + * Parses the known GitHub repositories for new versions of modules. + * + * Searches the remote GitHub repositories for a module with a like filename to that of the ones + * installed in the running Gallery isntall. Reads the remote modules module.info file to + * gather the version information. Uses the following locations; + * + * http://github.com/gallery/gallery3 + * http://github.com/gallery/gallery3-contrib + * + * @author brentil + * @param String The folder name of the module to search for on the remote GitHub server + * @return Array An array with the remote module version and the server it was found on. + */ + private function get_remote_module_version ($module_name) { + + $version = 'DNE'; + $server = ''; + $file = null; + + try { + $file = fopen ("http://github.com/gallery/gallery3/raw/master/modules/".$module_name."/module.info", "r"); + if ($file != null) { + $server = '(G3)'; + } + } + catch (Exception $e) { + //echo 'Message: ' .$e->getMessage() . '
    '; + } + + if ($file == null) { + try { + $file = fopen ("http://github.com/gallery/gallery3-contrib/raw/master/modules/".$module_name."/module.info", "r"); + if ($file != null) { + $server = '(G3CC)'; + } + } + catch (Exception $e) { + //echo 'Message: ' .$e->getMessage() . '
    '; + } + } + + if ($file != null) { + while (!feof ($file)) { + $line = fgets ($file, 1024); + + //Regular expression to find & gather the version number in the remote module.info file + if (preg_match ("@version = (.*)@i", $line, $out)) { + $version = $out[1]; + break; + } + } + fclose ($file); + } + + return array ($version, $server); + } +} diff --git a/modules/moduleupdates/helpers/moduleupdates_event.php b/modules/moduleupdates/helpers/moduleupdates_event.php new file mode 100644 index 00000000..dd6efc9c --- /dev/null +++ b/modules/moduleupdates/helpers/moduleupdates_event.php @@ -0,0 +1,30 @@ +get("settings_menu") + ->append(Menu::factory("link") + ->id("moduleupdates_menu") + ->label(t("Module Updates")) + ->url(url::site("admin/moduleupdates"))); + } +} \ No newline at end of file diff --git a/modules/moduleupdates/helpers/moduleupdates_installer.php b/modules/moduleupdates/helpers/moduleupdates_installer.php new file mode 100644 index 00000000..c15f4d82 --- /dev/null +++ b/modules/moduleupdates/helpers/moduleupdates_installer.php @@ -0,0 +1,37 @@ + + +
    +

    +

    +
    ") ?> + Red = Your version is older than the GitHub
    ") ?> + Green = Your version is newer than the GitHub
    ") ?> + Orange = Your file version is newer than the installed version
    ") ?> + Pink = Your installed version is newer than file version
    ") ?> + Blue = Does Not Exist/No information available
    ") ?> +

    + +
      +
      • +
    + +
    + + + + + + + + + "> + + + + + + +
    [File/Installed]") ?>
    "; ?> "; ?> "; ?> "; ?>
    +
    +
    +
    +
    \ No newline at end of file diff --git a/modules/navcarousel/controllers/admin_navcarousel.php b/modules/navcarousel/controllers/admin_navcarousel.php new file mode 100644 index 00000000..5d9dff60 --- /dev/null +++ b/modules/navcarousel/controllers/admin_navcarousel.php @@ -0,0 +1,134 @@ +_get_view(); + } + + public function handler() { + access::verify_csrf(); + + $form = $this->_get_form(); + if ($form->validate()) { + $scrollsize = intval($form->navcarousel->scrollsize->value); + $showelements = intval($form->navcarousel->showelements->value); + $carouselwidth = intval($form->navcarousel->carouselwidth->value); + $thumbsize = intval($form->thumbsettings->thumbsize->value); + if ($showelements < 1) { + $showelements = 1; + message::error(t("You must show at least one item.")); + } + if ($scrollsize < 1) { + $scrollsize = 1; + message::error(t("You must scroll by at least one item.")); + } + if ($thumbsize > 150 || $thumbsize < 25) { + $thumbsize = 50; + message::error(t("The size of the thumbnails must be between 25 and 150 pixel.")); + } + if ($carouselwidth < ($thumbsize + 75) && $carouselwidth > 0) { + $carouselwidth = $thumbsize + 75; + message::error(t("The carousel must be at least %pixel wide.", array("pixel" => $carouselwidth))); + } + if ($carouselwidth > 0) { + if ($carouselwidth < ((($thumbsize + 11) * $showelements) + 64)) { + $showelements = ($carouselwidth - 64) / ($thumbsize + 11); + $showelements = intval(floor($showelements)); + message::error(t("With the selected carousel width and thumbnail size you can show a maximum of %itemno items.", array("itemno" => $showelements))); + } + } else { + message::warning(t("The maximum number of displayable items cannot be calculated when the carousel width is set to 0.")); + } + if ($scrollsize > $showelements) { + $scrollsize = $showelements; + message::error(t("The number of items to scroll must not exceed the number of items to show.")); + } + module::set_var( + "navcarousel", "scrollsize", $scrollsize); + module::set_var( + "navcarousel", "showelements", $showelements); + module::set_var( + "navcarousel", "carouselwidth", $carouselwidth); + module::set_var( + "navcarousel", "thumbsize", $thumbsize); + module::set_var( + "navcarousel", "abovephoto", $form->navcarousel->abovephoto->value, true); + module::set_var( + "navcarousel", "noajax", $form->navcarousel->noajax->value, true); + module::set_var( + "navcarousel", "showondomready", $form->navcarousel->showondomready->value, true); + module::set_var( + "navcarousel", "maintainaspect", $form->thumbsettings->maintainaspect->value, true); + module::set_var( + "navcarousel", "nomouseover", $form->thumbsettings->nomouseover->value, true); + module::set_var( + "navcarousel", "noresize", $form->thumbsettings->noresize->value, true); + + message::success(t("Your settings have been saved.")); + url::redirect("admin/navcarousel"); + } + print $this->_get_view($form); + } + + private function _get_view($form=null) { + $v = new Admin_View("admin.html"); + $v->content = new View("admin_navcarousel.html"); + $v->content->form = empty($form) ? $this->_get_form() : $form; + return $v; + } + + private function _get_form() { + $form = new Forge("admin/navcarousel/handler", "", "post", array("id" => "g-admin-form")); + + $group = $form->group("navcarousel")->label(t("Navigation carousel settings")); + $group->input("scrollsize")->label(t('Enter how many items you want to scroll when clicking next or previous')) + ->value(module::get_var("navcarousel", "scrollsize", "7")) + ->rules("valid_numeric|length[1,2]"); + $group->input("showelements")->label(t('Enter how many items you want to be visible')) + ->value(module::get_var("navcarousel", "showelements", "7")) + ->rules("valid_numeric|length[1,2]"); + $group->input("carouselwidth")->label(t('Carousel width (in pixel). If set to 0 the carousel will use the full available width.')) + ->value(module::get_var("navcarousel", "carouselwidth", "600")) + ->rules("valid_numeric|length[1,3]"); + $group->checkbox("abovephoto")->label(t("Show carousel above photo")) + ->checked(module::get_var("navcarousel", "abovephoto", false)); + $group->checkbox("noajax")->label(t("Disable dynamic loading of thumbnails (might be slow for big albums)")) + ->checked(module::get_var("navcarousel", "noajax", false)); + $group->checkbox("showondomready")->label(t("Show carousel before all items are loaded (faster loading on large albums but might cause too early display on Chrome and Opera)")) + ->checked(module::get_var("navcarousel", "showondomready", false)); + + $group = $form->group("thumbsettings")->label(t("Change how thumnails are displayed")); + $group->input("thumbsize")->label(t('Thumbnail size (in pixel)')) + ->value(module::get_var("navcarousel", "thumbsize", "50")) + ->rules("valid_numeric|length[1,3]"); + $group->checkbox("nomouseover")->label(t("Do not show item title and number on mouse over")) + ->checked(module::get_var("navcarousel", "nomouseover", false)); + $group->checkbox("noresize")->label(t("Crop thumbails instead of resizing them.")) + ->onClick("changeaspectstate()") + ->id("noresize") + ->checked(module::get_var("navcarousel", "noresize", false)); + $group->checkbox("maintainaspect")->label(t("Maintain aspect ratio of the items for the thumbnails.")) + ->id("maintainaspect") + ->checked(module::get_var("navcarousel", "maintainaspect", false)); + + $form->submit("submit")->value(t("Save")); + return $form; + } +} diff --git a/modules/navcarousel/controllers/navcarousel.php b/modules/navcarousel/controllers/navcarousel.php new file mode 100644 index 00000000..7b8125a7 --- /dev/null +++ b/modules/navcarousel/controllers/navcarousel.php @@ -0,0 +1,62 @@ +parent(); + $item_count = -1; + + // Array indexes are 0-based, jCarousel positions are 1-based. + $first = max(0, intval($_GET['first']) - 1); + $last = max($first + 1, intval($_GET['last']) - 1); + + $length = $last - $first + 1; + + // Build the array with the thumbnail URLs + foreach ($parent->viewable()->children() as $photo) { + if (!$photo->is_album()) { + $item_count++; + $itemlist[$item_count] = $photo->thumb_url(); + } + } + + $total = count($itemlist); + $selected = array_slice($itemlist, $first, $length); + + // --- + + header('Content-Type: text/xml'); + + echo ''; + + // Return total number of images so the callback + // can set the size of the carousel. + echo ' ' . $total . ''; + + foreach ($selected as $img) { + echo ' ' . $img . ''; + } + + echo ''; + + } +} diff --git a/modules/navcarousel/css/credits.txt b/modules/navcarousel/css/credits.txt new file mode 100644 index 00000000..e5ec8c29 --- /dev/null +++ b/modules/navcarousel/css/credits.txt @@ -0,0 +1 @@ +Button images copyright by Tango Icon Library Team (http://tango.freedesktop.org/Tango_Icon_Library) \ No newline at end of file diff --git a/modules/navcarousel/css/skin.css b/modules/navcarousel/css/skin.css new file mode 100644 index 00000000..695779f0 --- /dev/null +++ b/modules/navcarousel/css/skin.css @@ -0,0 +1,122 @@ +.jcarousel-skin-tango .jcarousel-container { + -moz-border-radius: 10px; + background: transparent; + border: 0; +} + +.jcarousel-skin-tango .jcarousel-container-horizontal { + padding: 0 60px; + margin: 0 auto; +} + +.jcarousel-skin-tango .jcarousel-item { + background-color: transparent !important; +} + +.jcarousel-skin-tango .jcarousel-item-horizontal { + margin-right: 2px; + margin-right: 2px; + padding-top: 2px; + text-align: center; +} + +.jcarousel-skin-tango .jcarousel-item-placeholder { + background: #fff; + color: #000; +} + +/** + * Horizontal Buttons + */ +.jcarousel-skin-tango .jcarousel-next-horizontal { + position: absolute; + right: 18px; + width: 32px; + height: 32px; + cursor: pointer; + background: transparent url('../images/next-horizontal.png') no-repeat 0 0; + visibility: hidden; +} + +.jcarousel-skin-tango .jcarousel-next-horizontal:hover { + background-position: -32px 0; +} + +.jcarousel-skin-tango .jcarousel-next-horizontal:active { + background-position: -64px 0; +} + +.jcarousel-skin-tango .jcarousel-next-disabled-horizontal, +.jcarousel-skin-tango .jcarousel-next-disabled-horizontal:hover, +.jcarousel-skin-tango .jcarousel-next-disabled-horizontal:active { + cursor: default; + background-position: -96px 0; +} + +.jcarousel-skin-tango .jcarousel-prev-horizontal { + position: absolute; + left: 18px; + width: 32px; + height: 32px; + cursor: pointer; + background: transparent url('../images/prev-horizontal.png') no-repeat 0 0; + visibility: hidden; +} + +.jcarousel-skin-tango .jcarousel-prev-horizontal:hover { + background-position: -32px 0; +} + +.jcarousel-skin-tango .jcarousel-prev-horizontal:active { + background-position: -64px 0; +} + +.jcarousel-skin-tango .jcarousel-prev-disabled-horizontal, +.jcarousel-skin-tango .jcarousel-prev-disabled-horizontal:hover, +.jcarousel-skin-tango .jcarousel-prev-disabled-horizontal:active { + cursor: default; + background-position: -96px 0; +} + +.carousel-thumbnail { + padding: 5px; + margin: 0 !important; +} + +.carousel-thumbnail:hover { + box-shadow: 1px 0px 8px #d7e1fa; + -moz-box-shadow: 1px 0px 8px #d7e1fa; + -webkit-box-shadow: 1px 0px 8px #d7e1fa; +} + +.carousel-current { + box-shadow: 1px 0px 8px #d7e1fa; + -moz-box-shadow: 1px 0px 8px #d7e1fa; + -webkit-box-shadow: 1px 0px 8px #d7e1fa; + padding: 5px; + margin: 0 !important; +} + +#navcarousel-wrapper { + width: 100%; + background: url('../images/ajax-loader.gif') no-repeat center center; +} + +#navcarousel { + visibility: hidden; +} + +/** + * RTL Support + */ + +.jcarousel-skin-tango .jcarousel-direction-rtl {direction:rtl;} +.jcarousel-skin-tango .jcarousel-direction-rtl .jcarousel-item-horizontal{ margin-right:0; margin-left:10px;} + +/*horizontal buttons*/ +.jcarousel-skin-tango .jcarousel-direction-rtl .jcarousel-next-horizontal{ + background-image:url('../images/prev-horizontal.png'); right:auto; left:5px; +} +.jcarousel-skin-tango .jcarousel-direction-rtl .jcarousel-prev-horizontal{ + background-image:url('../images/next-horizontal.png'); left:auto; right:5px; +} diff --git a/modules/navcarousel/helpers/navcarousel_event.php b/modules/navcarousel/helpers/navcarousel_event.php new file mode 100644 index 00000000..a636ea23 --- /dev/null +++ b/modules/navcarousel/helpers/navcarousel_event.php @@ -0,0 +1,28 @@ +get("settings_menu") + ->append(Menu::factory("link") + ->id("navcarousel_menu") + ->label(t("Navigation carousel")) + ->url(url::site("admin/navcarousel"))); + } +} diff --git a/modules/navcarousel/helpers/navcarousel_theme.php b/modules/navcarousel/helpers/navcarousel_theme.php new file mode 100644 index 00000000..99853437 --- /dev/null +++ b/modules/navcarousel/helpers/navcarousel_theme.php @@ -0,0 +1,125 @@ +page_type == "item") { + if (locales::is_rtl()) { + $rtl_support = "horizontalDirection: 'rtl',\n"; + } else { + $rtl_support = ""; + } + $carouselwidth = module::get_var("navcarousel", "carouselwidth", "600"); + if ($carouselwidth == 0) { + $carouselwidth = "100%"; + $containerwidth = ""; + } else { + $carouselwidth = $carouselwidth ."px"; + $containerwidth = ".jcarousel-skin-tango .jcarousel-container-horizontal {\n + width: ". $carouselwidth .";\n + }\n"; + } + $thumbsize = module::get_var("navcarousel", "thumbsize", "50"); + $theme->script("jquery.jcarousel.min.js"); + $theme->css("skin.css"); + $showelements = module::get_var("navcarousel", "showelements", "7"); + $childcount = $theme->item->parent()->viewable()->children_count(); + $itemoffset = intval(floor($showelements / 2)); + if ($childcount <= $showelements) { + $itemoffset = 1; + } else { + $itempos = $theme->item->parent()->get_position($theme->item); + $itemoffset = $itempos - $itemoffset; + if ($itemoffset < 1) { + $itemoffset = 1; + } + if (($itemoffset + $showelements) > $childcount) { + $itemoffset = $childcount - $showelements + 1; + } + } + if (module::get_var("navcarousel", "noajax", false)) { + $ajaxhandler = ""; + } else { + $ajaxhandler = "itemLoadCallback: navcarousel_itemLoadCallback,\n"; + } + if (module::get_var("navcarousel", "showondomready", false)) { + $onwinload = ""; + } else { + $onwinload = "});\n + $(window).load(function () {\n"; + } + Return "\n + \n + \n + "; + } + } + + static function photo_bottom($theme) { + if (!module::get_var("navcarousel", "abovephoto", false)) { + if ($theme->page_type == "item") { + return new View("navcarousel.html"); + } + } + } + + static function photo_top($theme) { + if (module::get_var("navcarousel", "abovephoto", false)) { + if ($theme->page_type == "item") { + return new View("navcarousel.html"); + } + } + } +} diff --git a/modules/navcarousel/images/ajax-loader.gif b/modules/navcarousel/images/ajax-loader.gif new file mode 100644 index 00000000..3288d103 Binary files /dev/null and b/modules/navcarousel/images/ajax-loader.gif differ diff --git a/modules/navcarousel/images/next-horizontal.png b/modules/navcarousel/images/next-horizontal.png new file mode 100644 index 00000000..c9943fda Binary files /dev/null and b/modules/navcarousel/images/next-horizontal.png differ diff --git a/modules/navcarousel/images/prev-horizontal.png b/modules/navcarousel/images/prev-horizontal.png new file mode 100644 index 00000000..e963d28e Binary files /dev/null and b/modules/navcarousel/images/prev-horizontal.png differ diff --git a/modules/navcarousel/js/jquery.jcarousel.min.js b/modules/navcarousel/js/jquery.jcarousel.min.js new file mode 100644 index 00000000..f7c76886 --- /dev/null +++ b/modules/navcarousel/js/jquery.jcarousel.min.js @@ -0,0 +1,18 @@ +/*! + * jCarousel - Riding carousels with jQuery + * http://sorgalla.com/jcarousel/ + * + * Copyright (c) 2006 Jan Sorgalla (http://sorgalla.com) + * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) + * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses. + * + * Built on top of the jQuery library + * http://jquery.com + * + * Inspired by the "Carousel Component" by Bill Scott + * http://billwscott.com/carousel/ + * + * RTLed by nightS @ RTL-This + * http://rtl-this.com/tutorial/rtling-jcarousel-jquery-plugin + */ +(function($){$.fn.jcarousel=function(o){if(typeof o=='string'){var instance=$(this).data('jcarousel'),args=Array.prototype.slice.call(arguments,1);return instance[o].apply(instance,args)}else return this.each(function(){$(this).data('jcarousel',new $jc(this,o))})};var defaults={vertical:false,horizontalDirection:'ltr',start:1,offset:1,size:null,scroll:3,visible:null,animation:'normal',easing:'swing',auto:0,wrap:null,initCallback:null,reloadCallback:null,itemLoadCallback:null,itemFirstInCallback:null,itemFirstOutCallback:null,itemLastInCallback:null,itemLastOutCallback:null,itemVisibleInCallback:null,itemVisibleOutCallback:null,buttonNextHTML:'
    ',buttonPrevHTML:'
    ',buttonNextEvent:'click',buttonPrevEvent:'click',buttonNextCallback:null,buttonPrevCallback:null};$.jcarousel=function(e,o){this.options=$.extend({},defaults,o||{});this.locked=false;this.container=null;this.clip=null;this.list=null;this.buttonNext=null;this.buttonPrev=null;this.wh=!this.options.vertical?'width':'height';this.lt=!this.options.vertical?(this.options.horizontalDirection=='rtl'?'right':'left'):'top';var skin='',split=e.className.split(' ');for(var i=0;i');this.container=this.container.parent()}else if(!this.container.hasClass('jcarousel-container'))this.container=this.list.wrap('
    ').parent()}else{this.container=$(e);this.list=this.container.find('ul,ol').eq(0)}if(skin!=''&&this.container.parent()[0].className.indexOf('jcarousel-skin')==-1)this.container.wrap('
    ');this.clip=this.list.parent();if(!this.clip.length||!this.clip.hasClass('jcarousel-clip'))this.clip=this.list.wrap('
    ').parent();this.buttonNext=$('.jcarousel-next',this.container);if(this.buttonNext.size()==0&&this.options.buttonNextHTML!=null)this.buttonNext=this.clip.after(this.options.buttonNextHTML).next();this.buttonNext.addClass(this.className('jcarousel-next'));this.buttonPrev=$('.jcarousel-prev',this.container);if(this.buttonPrev.size()==0&&this.options.buttonPrevHTML!=null)this.buttonPrev=this.clip.after(this.options.buttonPrevHTML).next();this.buttonPrev.addClass(this.className('jcarousel-prev'));this.clip.addClass(this.className('jcarousel-clip')).css({overflow:'hidden',position:'relative'});this.list.addClass(this.className('jcarousel-list')).css({overflow:'hidden',position:'relative',top:0,left:0,margin:0,padding:0});this.container.addClass(this.className('jcarousel-container')).addClass(!this.options.vertical?'jcarousel-direction-'+this.options.horizontalDirection:'').css({position:'relative'});var di=this.options.visible!=null?Math.ceil(this.clipping()/this.options.visible):null;var li=this.list.children('li');var self=this;if(li.size()>0){var wh=0,i=this.options.offset;li.each(function(){self.format(this,i++);wh+=self.dimension(this,di)});this.list.css(this.wh,wh+'px');if(!o||o.size===undefined)this.options.size=li.size()}this.container.css('display','block');this.buttonNext.css('display','block');this.buttonPrev.css('display','block');this.funcNext=function(){self.next()};this.funcPrev=function(){self.prev()};this.funcResize=function(){self.reload()};if(this.options.initCallback!=null)this.options.initCallback(this,'init');if($.browser.safari){this.buttons(false,false);$(window).bind('load.jcarousel',function(){self.setup()})}else this.setup()};var $jc=$.jcarousel;$jc.fn=$jc.prototype={jcarousel:'0.2.4'};$jc.fn.extend=$jc.extend=$.extend;$jc.fn.extend({setup:function(){this.first=null;this.last=null;this.prevFirst=null;this.prevLast=null;this.animating=false;this.timer=null;this.tail=null;this.inTail=false;if(this.locked)return;this.list.css(this.lt,this.pos(this.options.offset)+'px');var p=this.pos(this.options.start);this.prevFirst=this.prevLast=null;this.animate(p,false);$(window).unbind('resize.jcarousel',this.funcResize).bind('resize.jcarousel',this.funcResize)},reset:function(){this.list.empty();this.list.css(this.lt,'0px');this.list.css(this.wh,'10px');if(this.options.initCallback!=null)this.options.initCallback(this,'reset');this.setup()},reload:function(){if(this.tail!=null&&this.inTail)this.list.css(this.lt,$jc.intval(this.list.css(this.lt))+this.tail);this.tail=null;this.inTail=false;if(this.options.reloadCallback!=null)this.options.reloadCallback(this);if(this.options.visible!=null){var self=this;var di=Math.ceil(this.clipping()/this.options.visible),wh=0,lt=0;$('li',this.list).each(function(i){wh+=self.dimension(this,di);if(i+1this.options.size)i2=this.options.size;for(var j=i;j<=i2;j++){var e=this.get(j);if(!e.length||e.hasClass('jcarousel-item-placeholder'))return false}return true},get:function(i){return $('.jcarousel-item-'+i,this.list)},add:function(i,s){var e=this.get(i),old=0,add=0;if(e.length==0){var c,e=this.create(i),j=$jc.intval(i);while(c=this.get(--j)){if(j<=0||c.length){j<=0?this.list.prepend(e):c.after(e);break}}}else old=this.dimension(e);e.removeClass(this.className('jcarousel-item-placeholder'));typeof s=='string'?e.html(s):e.empty().append(s);var di=this.options.visible!=null?Math.ceil(this.clipping()/this.options.visible):null;var wh=this.dimension(e,di)-old;if(i>0&&i=this.first&&i<=this.last))return;var d=this.dimension(e);if(ithis.options.size?this.options.size:i);var back=this.first>i;var f=this.options.wrap!='circular'&&this.first<=1?1:this.first;var c=back?this.get(f):this.get(this.last);var j=back?f:f-1;var e=null,l=0,p=false,d=0,g;while(back?--j>=i:++jthis.options.size)){g=this.get(this.index(j));if(g.length)this.add(j,g.children().clone(true))}}c=e;d=this.dimension(e);if(p)l+=d;if(this.first!=null&&(this.options.wrap=='circular'||(j>=1&&(this.options.size==null||j<=this.options.size))))pos=back?pos+d:pos-d}var clipping=this.clipping();var cache=[];var visible=0,j=i,v=0;var c=this.get(i-1);while(++visible){e=this.get(j);p=!e.length;if(e.length==0){e=this.create(j).addClass(this.className('jcarousel-item-placeholder'));c.length==0?this.list.prepend(e):c[back?'before':'after'](e);if(this.first!=null&&this.options.wrap=='circular'&&this.options.size!==null&&(j<=0||j>this.options.size)){g=this.get(this.index(j));if(g.length)this.add(j,g.find('>*').clone(true))}}c=e;var d=this.dimension(e);if(d==0){alert('jCarousel: No width/height set for items. This will cause an infinite loop. Aborting...');return 0}if(this.options.wrap!='circular'&&this.options.size!==null&&j>this.options.size)cache.push(e);else if(p)l+=d;v+=d;if(v>=clipping)break;j++}for(var x=0;x0){this.list.css(this.wh,this.dimension(this.list)+l+'px');if(back){pos-=l;this.list.css(this.lt,$jc.intval(this.list.css(this.lt))-l+'px')}}var last=i+visible-1;if(this.options.wrap!='circular'&&this.options.size&&last>this.options.size)last=this.options.size;if(j>last){visible=0,j=last,v=0;while(++visible){var e=this.get(j--);if(!e.length)break;v+=this.dimension(e);if(v>=clipping)break}}var first=last-visible+1;if(this.options.wrap!='circular'&&first<1)first=1;if(this.inTail&&back){pos+=this.tail;this.inTail=false}this.tail=null;if(this.options.wrap!='circular'&&last==this.options.size&&(last-visible+1)>=1){var m=$jc.margin(this.get(last),!this.options.vertical?'marginRight':'marginBottom');if((v-m)>clipping)this.tail=v-clipping-m}while(i-->first)pos+=this.dimension(this.get(i));this.prevFirst=this.first;this.prevLast=this.last;this.first=first;this.last=last;return pos},animate:function(p,a){if(this.locked||this.animating)return;this.animating=true;var self=this;var scrolled=function(){self.animating=false;if(p==0)self.list.css(self.lt,0);if(self.options.wrap=='circular'||self.options.wrap=='both'||self.options.wrap=='last'||self.options.size==null||self.last=this.options.size)n=this.tail!=null&&this.inTail}if(p==undefined||p==null){var p=!this.locked&&this.options.size!==0&&((this.options.wrap&&this.options.wrap!='last')||this.first>1);if(!this.locked&&(!this.options.wrap||this.options.wrap=='last')&&this.options.size!=null&&this.first==1)p=this.tail!=null&&this.inTail}var self=this;this.buttonNext[n?'bind':'unbind'](this.options.buttonNextEvent+'.jcarousel',this.funcNext)[n?'removeClass':'addClass'](this.className('jcarousel-next-disabled')).attr('disabled',n?false:true);this.buttonPrev[p?'bind':'unbind'](this.options.buttonPrevEvent+'.jcarousel',this.funcPrev)[p?'removeClass':'addClass'](this.className('jcarousel-prev-disabled')).attr('disabled',p?false:true);if(this.buttonNext.length>0&&(this.buttonNext[0].jcarouselstate==undefined||this.buttonNext[0].jcarouselstate!=n)&&this.options.buttonNextCallback!=null){this.buttonNext.each(function(){self.options.buttonNextCallback(self,this,n)});this.buttonNext[0].jcarouselstate=n}if(this.buttonPrev.length>0&&(this.buttonPrev[0].jcarouselstate==undefined||this.buttonPrev[0].jcarouselstate!=p)&&this.options.buttonPrevCallback!=null){this.buttonPrev.each(function(){self.options.buttonPrevCallback(self,this,p)});this.buttonPrev[0].jcarouselstate=p}},notify:function(evt){var state=this.prevFirst==null?'init':(this.prevFirst=i3&&i<=i4))this.get(i).each(function(){callback(self,this,i,state,evt)})}},create:function(i){return this.format('
  • ',i)},format:function(e,i){var $e=$(e).addClass(this.className('jcarousel-item')).addClass(this.className('jcarousel-item-'+i)).css({'float':(this.options.horizontalDirection=='rtl'?'right':'left'),'list-style':'none'});$e.attr('jcarouselindex',i);return $e},className:function(c){return c+' '+c+(!this.options.vertical?'-horizontal':'-vertical')},dimension:function(e,d){var el=e.jquery!=undefined?e[0]:e;var old=!this.options.vertical?el.offsetWidth+$jc.margin(el,'marginLeft')+$jc.margin(el,'marginRight'):el.offsetHeight+$jc.margin(el,'marginTop')+$jc.margin(el,'marginBottom');if(d==undefined||old==d)return old;var w=!this.options.vertical?d-$jc.margin(el,'marginLeft')-$jc.margin(el,'marginRight'):d-$jc.margin(el,'marginTop')-$jc.margin(el,'marginBottom');$(el).css(this.wh,w+'px');return this.dimension(el)},clipping:function(){return!this.options.vertical?this.clip[0].offsetWidth-$jc.intval(this.clip.css('borderLeftWidth'))-$jc.intval(this.clip.css('borderRightWidth')):this.clip[0].offsetHeight-$jc.intval(this.clip.css('borderTopWidth'))-$jc.intval(this.clip.css('borderBottomWidth'))},index:function(i,s){if(s==undefined)s=this.options.size;return Math.round((((i-1)/s)-Math.floor((i-1)/s))*s)+1}});$jc.extend({defaults:function(d){return $.extend(defaults,d||{})},margin:function(e,p){if(!e)return 0;var el=e.jquery!=undefined?e[0]:e;if(p=='marginRight'&&$.browser.safari){var old={'display':'block','float':'none','width':'auto'},oWidth,oWidth2;$.swap(el,old,function(){oWidth=el.offsetWidth});old['marginRight']=0;$.swap(el,old,function(){oWidth2=el.offsetWidth});return oWidth2-oWidth}return $jc.intval($.css(el,p))},intval:function(v){v=parseInt(v);return isNaN(v)?0:v}})})(jQuery); diff --git a/modules/navcarousel/module.info b/modules/navcarousel/module.info new file mode 100644 index 00000000..d1e0e0ff --- /dev/null +++ b/modules/navcarousel/module.info @@ -0,0 +1,3 @@ +name = "Navigation Carousel" +description = "Adds a navigation carousel under the photo." +version = 4.2 diff --git a/modules/navcarousel/views/admin_navcarousel.html.php b/modules/navcarousel/views/admin_navcarousel.html.php new file mode 100644 index 00000000..5a116104 --- /dev/null +++ b/modules/navcarousel/views/admin_navcarousel.html.php @@ -0,0 +1,17 @@ + + +
    +

    +

    +

    + If you are experiencing this bug then please enable the option 'Disable dynamic loading of thumbnails'.
    + I am working on fixing this bug and will release an update as soon as possible.") ?>

    + +
    diff --git a/modules/navcarousel/views/navcarousel.html.php b/modules/navcarousel/views/navcarousel.html.php new file mode 100644 index 00000000..40af0d8e --- /dev/null +++ b/modules/navcarousel/views/navcarousel.html.php @@ -0,0 +1,118 @@ +parent(); + $item_counter = 0; + $item_offset = 0; + $maintain_aspect = module::get_var("navcarousel", "maintainaspect", false); + $no_resize = module::get_var("navcarousel", "noresize", false); + $no_ajax = module::get_var("navcarousel", "noajax", false); +?> + + +three_nids theme"; +class no_home_link_event_Core { + static function site_menu($menu, $theme, $item_css_selector) { + $menu->remove("home"); } } - diff --git a/modules/no_home_link/module.info b/modules/no_home_link/module.info new file mode 100644 index 00000000..32b0d337 --- /dev/null +++ b/modules/no_home_link/module.info @@ -0,0 +1,3 @@ +name = "No Home Link" +description = "Gets rid of the 'Home' link in the menu." +version = 1 diff --git a/modules/nobots/views/nobots_block.html.php b/modules/nobots/views/nobots_block.html.php index a77a53db..370015de 100644 --- a/modules/nobots/views/nobots_block.html.php +++ b/modules/nobots/views/nobots_block.html.php @@ -3,5 +3,5 @@ - - + + diff --git a/modules/register/controllers/register.php b/modules/register/controllers/register.php index 0de79529..93c183a2 100755 --- a/modules/register/controllers/register.php +++ b/modules/register/controllers/register.php @@ -57,11 +57,9 @@ class register_Controller extends Controller { message::success(t("A confirmation email has been sent to your email address.")); } - print json_encode(array("result" => "success")); + json::reply(array("result" => "success")); } else { - print json_encode( - array("result" => "error", - "form" => (string) $form)); + json::reply(array("result" => "error", "html" => (string)$form)); } } diff --git a/modules/scheduler/controllers/admin_schedule.php b/modules/scheduler/controllers/admin_schedule.php index b43b12fb..fbf84919 100644 --- a/modules/scheduler/controllers/admin_schedule.php +++ b/modules/scheduler/controllers/admin_schedule.php @@ -93,7 +93,7 @@ class Admin_Schedule_Controller extends Admin_Maintenance_Controller { $schedule->delete(); message::success(t("Removed scheduled task: %name", array("name" => $schedule->name))); - print json_encode(array("result" => "success", "reload" => 1)); + json::reply(array("result" => "success", "reload" => 1)); } public function define() { @@ -121,9 +121,9 @@ class Admin_Schedule_Controller extends Admin_Maintenance_Controller { } else { message::success(t("Updated scheduled task: %name", array("name" => $schedule->name))); } - print json_encode(array("result" => "success", "reload" => 1)); + json::reply(array("result" => "success", "reload" => 1)); } else { - print json_encode(array("result" => "error", "form" => (string) $form)); + json::reply(array("result" => "error", "html" => (string)$form)); } } diff --git a/modules/sharephoto/controllers/admin_sharephoto.php b/modules/sharephoto/controllers/admin_sharephoto.php new file mode 100644 index 00000000..cc426362 --- /dev/null +++ b/modules/sharephoto/controllers/admin_sharephoto.php @@ -0,0 +1,82 @@ +content = new View("admin_sharephoto.html"); + $view->content->sharephoto_form = $this->_get_admin_form(); + print $view; + } + + public function saveprefs() { + // Prevent Cross Site Request Forgery + access::verify_csrf(); + + $form = $this->_get_admin_form(); + + // Figure out which boxes where checked + $shareOpts_array = Input::instance()->post("ShareOptions"); + + $IconsButton = false; + $HTMLLinksButton = false; + + for ($i = 0; $i < count($shareOpts_array); $i++) { + if ($shareOpts_array[$i] == "Icons") { + $IconsButton = true; + } + if ($shareOpts_array[$i] == "HTMLLinks") { + $HTMLLinksButton = true; + } + } + + // Save Settings. + module::set_var("sharephoto", "Icons", $IconsButton); + module::set_var("sharephoto", "HTMLLinks", $HTMLLinksButton); + message::success(t("Your Selection Has Been Saved.")); + + // Load Admin page. + $view = new Admin_View("admin.html"); + $view->content = new View("admin_sharephoto.html"); + $view->content->sharephoto_form = $form; + print $view; + } + + private function _get_admin_form() { + // New Form. + $form = new Forge("admin/sharephoto/saveprefs", "", "post", + array("id" => "g-sharephoto-adminForm")); + + // Select what to show on the Photo page. + $shareTypes["Icons"] = array(t("Show Icons   "), module::get_var("sharephoto", "Icons")); + $shareTypes["HTMLLinks"] = array(t("Show HTML Links"), module::get_var("sharephoto", "HTMLLinks")); + + // Checkboxes + $add_links = $form->group("SharePhoto"); + $add_links->checklist("ShareOptions") + ->options($shareTypes); + + // Save button + $add_links->submit("SaveSettings")->value(t("Save")); + + // Return the newly generated form. + return $form; + } +} \ No newline at end of file diff --git a/modules/sharephoto/css/sharephoto.css b/modules/sharephoto/css/sharephoto.css new file mode 100644 index 00000000..704b32f8 --- /dev/null +++ b/modules/sharephoto/css/sharephoto.css @@ -0,0 +1,65 @@ +#g-sharephoto-links { + font-size: 15px; + margin-top: 55px; +} + +#g-sharephoto-links-position { + margin-bottom: 7px; + border-bottom: 1px solid #B6B6B6; + font-weight: bold; + margin-left: 10px; + margin-right: 10px; +} + +#g-sharephoto-links-small { + font-size:11px; + color:gray; +} + +#dock { + position: relative; + bottom: 0; + font: 13px; +} + +.dock-container { + position: relative; + height: 80px; + padding: 10px; +} + +.dock-contaner-left { + width: 15px; + height: 32px; + position: absolute; + bottom: 0; + left: -15px; +} + +.dock-container .custom_images a { + display: block; + width: 50px; + position: absolute; + bottom: 0; + text-align: center; + text-decoration: none; + color: #333; + cursor: pointer; +} + +.dock-container .custom_images span { + background: rgba(0,0,0,.75); + display: none; + padding: 2px 8px; + margin-left: 17px; + font-size: 11px; + color: #fff; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; +} + +.dock-container .custom_images img { + border: 0; + margin: 5px 5px 0px; + width: 100%; +} diff --git a/modules/sharephoto/helpers/sharephoto_event.php b/modules/sharephoto/helpers/sharephoto_event.php new file mode 100644 index 00000000..616a9fe2 --- /dev/null +++ b/modules/sharephoto/helpers/sharephoto_event.php @@ -0,0 +1,28 @@ +get("settings_menu") + ->append(Menu::factory("link") + ->id("sharephoto") + ->label(t("SharePhoto")) + ->url(url::site("admin/sharephoto"))); + } +} diff --git a/modules/sharephoto/helpers/sharephoto_theme.php b/modules/sharephoto/helpers/sharephoto_theme.php new file mode 100644 index 00000000..bcb5549a --- /dev/null +++ b/modules/sharephoto/helpers/sharephoto_theme.php @@ -0,0 +1,39 @@ +css("sharephoto.css"); + $theme->script("sharephoto.js"); + return ""; + } + + + static function photo_bottom($theme) { + $block = new Block; + $block->css_id = "g-sharephoto"; + $block->title = t("Share Photo"); + $block->anchor = "sharephoto"; + + $view = new View("sharephoto.html"); + + $block->content = $view; + return $block; + } +} \ No newline at end of file diff --git a/modules/sharephoto/images/addthis.png b/modules/sharephoto/images/addthis.png new file mode 100644 index 00000000..de62f9a9 Binary files /dev/null and b/modules/sharephoto/images/addthis.png differ diff --git a/modules/sharephoto/images/addthis_64.png b/modules/sharephoto/images/addthis_64.png new file mode 100644 index 00000000..0e781de2 Binary files /dev/null and b/modules/sharephoto/images/addthis_64.png differ diff --git a/modules/sharephoto/images/btn-overlay.png b/modules/sharephoto/images/btn-overlay.png new file mode 100644 index 00000000..222cdc91 Binary files /dev/null and b/modules/sharephoto/images/btn-overlay.png differ diff --git a/modules/sharephoto/images/delicious.png b/modules/sharephoto/images/delicious.png new file mode 100644 index 00000000..836e7f60 Binary files /dev/null and b/modules/sharephoto/images/delicious.png differ diff --git a/modules/sharephoto/images/facebook.png b/modules/sharephoto/images/facebook.png new file mode 100644 index 00000000..abac0e7a Binary files /dev/null and b/modules/sharephoto/images/facebook.png differ diff --git a/modules/sharephoto/images/facebook_64.png b/modules/sharephoto/images/facebook_64.png new file mode 100644 index 00000000..e038baea Binary files /dev/null and b/modules/sharephoto/images/facebook_64.png differ diff --git a/modules/sharephoto/images/icon-addthis.gif b/modules/sharephoto/images/icon-addthis.gif new file mode 100644 index 00000000..a0d56c8d Binary files /dev/null and b/modules/sharephoto/images/icon-addthis.gif differ diff --git a/modules/sharephoto/images/myspace.png b/modules/sharephoto/images/myspace.png new file mode 100644 index 00000000..af21eb02 Binary files /dev/null and b/modules/sharephoto/images/myspace.png differ diff --git a/modules/sharephoto/images/stumbleupon.png b/modules/sharephoto/images/stumbleupon.png new file mode 100644 index 00000000..d0f47362 Binary files /dev/null and b/modules/sharephoto/images/stumbleupon.png differ diff --git a/modules/sharephoto/images/twitter.png b/modules/sharephoto/images/twitter.png new file mode 100644 index 00000000..48e47271 Binary files /dev/null and b/modules/sharephoto/images/twitter.png differ diff --git a/modules/sharephoto/js/fisheye-iutil.min.js b/modules/sharephoto/js/fisheye-iutil.min.js new file mode 100644 index 00000000..30e09037 --- /dev/null +++ b/modules/sharephoto/js/fisheye-iutil.min.js @@ -0,0 +1,82 @@ +/** +* Interface Elements for jQuery +* Fisheye menu +* +* http://interface.eyecon.ro +* +* Copyright 2006 Stefan Petre +* Dual licensed under the MIT (MIT-LICENSE.txt) +* and GPL (GPL-LICENSE.txt) licenses. +* +*/ + +jQuery.iFisheye={build:function(options) +{return this.each(function() +{var el=this;el.fisheyeCfg={items:jQuery(options.items,this),container:jQuery(options.container,this),pos:jQuery.iUtil.getPosition(this),itemWidth:options.itemWidth,itemsText:options.itemsText,proximity:options.proximity,valign:options.valign,halign:options.halign,maxWidth:options.maxWidth};jQuery.iFisheye.positionContainer(el,0);jQuery(window).bind('resize',function() +{el.fisheyeCfg.pos=jQuery.iUtil.getPosition(el);jQuery.iFisheye.positionContainer(el,0);jQuery.iFisheye.positionItems(el);});jQuery.iFisheye.positionItems(el);el.fisheyeCfg.items.bind('mouseover',function() +{jQuery(el.fisheyeCfg.itemsText,this).get(0).style.display='block';}).bind('mouseout',function() +{jQuery(el.fisheyeCfg.itemsText,this).get(0).style.display='none';});jQuery(document).bind('mousemove',function(e) +{var pointer=jQuery.iUtil.getPointer(e);var toAdd=0;if(el.fisheyeCfg.halign&&el.fisheyeCfg.halign=='center') +var posx=pointer.x-el.fisheyeCfg.pos.x-(el.offsetWidth-el.fisheyeCfg.itemWidth*el.fisheyeCfg.items.size())/2-el.fisheyeCfg.itemWidth/2;else if(el.fisheyeCfg.halign&&el.fisheyeCfg.halign=='right') +var posx=pointer.x-el.fisheyeCfg.pos.x-el.offsetWidth+el.fisheyeCfg.itemWidth*el.fisheyeCfg.items.size();else +var posx=pointer.x-el.fisheyeCfg.pos.x;var posy=Math.pow(pointer.y-el.fisheyeCfg.pos.y-el.offsetHeight/2,2);el.fisheyeCfg.items.each(function(nr) +{distance=Math.sqrt(Math.pow(posx-nr*el.fisheyeCfg.itemWidth,2) ++posy);distance-=el.fisheyeCfg.itemWidth/2;distance=distance<0?0:distance;distance=distance>el.fisheyeCfg.proximity?el.fisheyeCfg.proximity:distance;distance=el.fisheyeCfg.proximity-distance;extraWidth=el.fisheyeCfg.maxWidth*distance/el.fisheyeCfg.proximity;this.style.width=el.fisheyeCfg.itemWidth+extraWidth+'px';this.style.left=el.fisheyeCfg.itemWidth*nr+toAdd+'px';toAdd+=extraWidth;});jQuery.iFisheye.positionContainer(el,toAdd);});})},positionContainer:function(el,toAdd) +{if(el.fisheyeCfg.halign) +if(el.fisheyeCfg.halign=='center') +el.fisheyeCfg.container.get(0).style.left=(el.offsetWidth-el.fisheyeCfg.itemWidth*el.fisheyeCfg.items.size())/2-toAdd/2+'px';else if(el.fisheyeCfg.halign=='left') +el.fisheyeCfg.container.get(0).style.left=-toAdd/el.fisheyeCfg.items.size()+'px';else if(el.fisheyeCfg.halign=='right') +el.fisheyeCfg.container.get(0).style.left=(el.offsetWidth-el.fisheyeCfg.itemWidth*el.fisheyeCfg.items.size())-toAdd/2+'px';el.fisheyeCfg.container.get(0).style.width=el.fisheyeCfg.itemWidth*el.fisheyeCfg.items.size()+toAdd+'px';},positionItems:function(el) +{el.fisheyeCfg.items.each(function(nr) +{this.style.width=el.fisheyeCfg.itemWidth+'px';this.style.left=el.fisheyeCfg.itemWidth*nr+'px';});}};jQuery.fn.Fisheye=jQuery.iFisheye.build;jQuery.iUtil={getPosition:function(e) +{var x=0;var y=0;var es=e.style;var restoreStyles=false;if(jQuery(e).css('display')=='none'){var oldVisibility=es.visibility;var oldPosition=es.position;restoreStyles=true;es.visibility='hidden';es.display='block';es.position='absolute';} +var el=e;while(el){x+=el.offsetLeft+(el.currentStyle&&!jQuery.browser.opera?parseInt(el.currentStyle.borderLeftWidth)||0:0);y+=el.offsetTop+(el.currentStyle&&!jQuery.browser.opera?parseInt(el.currentStyle.borderTopWidth)||0:0);el=el.offsetParent;} +el=e;while(el&&el.tagName&&el.tagName.toLowerCase()!='body') +{x-=el.scrollLeft||0;y-=el.scrollTop||0;el=el.parentNode;} +if(restoreStyles==true){es.display='none';es.position=oldPosition;es.visibility=oldVisibility;} +return{x:x,y:y};},getPositionLite:function(el) +{var x=0,y=0;while(el){x+=el.offsetLeft||0;y+=el.offsetTop||0;el=el.offsetParent;} +return{x:x,y:y};},getSize:function(e) +{var w=jQuery.css(e,'width');var h=jQuery.css(e,'height');var wb=0;var hb=0;var es=e.style;if(jQuery(e).css('display')!='none'){wb=e.offsetWidth;hb=e.offsetHeight;}else{var oldVisibility=es.visibility;var oldPosition=es.position;es.visibility='hidden';es.display='block';es.position='absolute';wb=e.offsetWidth;hb=e.offsetHeight;es.display='none';es.position=oldPosition;es.visibility=oldVisibility;} +return{w:w,h:h,wb:wb,hb:hb};},getSizeLite:function(el) +{return{wb:el.offsetWidth||0,hb:el.offsetHeight||0};},getClient:function(e) +{var h,w,de;if(e){w=e.clientWidth;h=e.clientHeight;}else{de=document.documentElement;w=window.innerWidth||self.innerWidth||(de&&de.clientWidth)||document.body.clientWidth;h=window.innerHeight||self.innerHeight||(de&&de.clientHeight)||document.body.clientHeight;} +return{w:w,h:h};},getScroll:function(e) +{var t=0,l=0,w=0,h=0,iw=0,ih=0;if(e&&e.nodeName.toLowerCase()!='body'){t=e.scrollTop;l=e.scrollLeft;w=e.scrollWidth;h=e.scrollHeight;iw=0;ih=0;}else{if(document.documentElement){t=document.documentElement.scrollTop;l=document.documentElement.scrollLeft;w=document.documentElement.scrollWidth;h=document.documentElement.scrollHeight;}else if(document.body){t=document.body.scrollTop;l=document.body.scrollLeft;w=document.body.scrollWidth;h=document.body.scrollHeight;} +iw=self.innerWidth||document.documentElement.clientWidth||document.body.clientWidth||0;ih=self.innerHeight||document.documentElement.clientHeight||document.body.clientHeight||0;} +return{t:t,l:l,w:w,h:h,iw:iw,ih:ih};},getMargins:function(e,toInteger) +{var el=jQuery(e);var t=el.css('marginTop')||'';var r=el.css('marginRight')||'';var b=el.css('marginBottom')||'';var l=el.css('marginLeft')||'';if(toInteger) +return{t:parseInt(t)||0,r:parseInt(r)||0,b:parseInt(b)||0,l:parseInt(l)};else +return{t:t,r:r,b:b,l:l};},getPadding:function(e,toInteger) +{var el=jQuery(e);var t=el.css('paddingTop')||'';var r=el.css('paddingRight')||'';var b=el.css('paddingBottom')||'';var l=el.css('paddingLeft')||'';if(toInteger) +return{t:parseInt(t)||0,r:parseInt(r)||0,b:parseInt(b)||0,l:parseInt(l)};else +return{t:t,r:r,b:b,l:l};},getBorder:function(e,toInteger) +{var el=jQuery(e);var t=el.css('borderTopWidth')||'';var r=el.css('borderRightWidth')||'';var b=el.css('borderBottomWidth')||'';var l=el.css('borderLeftWidth')||'';if(toInteger) +return{t:parseInt(t)||0,r:parseInt(r)||0,b:parseInt(b)||0,l:parseInt(l)||0};else +return{t:t,r:r,b:b,l:l};},getPointer:function(event) +{var x=event.pageX||(event.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft))||0;var y=event.pageY||(event.clientY+(document.documentElement.scrollTop||document.body.scrollTop))||0;return{x:x,y:y};},traverseDOM:function(nodeEl,func) +{func(nodeEl);nodeEl=nodeEl.firstChild;while(nodeEl){jQuery.iUtil.traverseDOM(nodeEl,func);nodeEl=nodeEl.nextSibling;}},purgeEvents:function(nodeEl) +{jQuery.iUtil.traverseDOM(nodeEl,function(el) +{for(var attr in el){if(typeof el[attr]==='function'){el[attr]=null;}}});},centerEl:function(el,axis) +{var clientScroll=jQuery.iUtil.getScroll();var windowSize=jQuery.iUtil.getSize(el);if(!axis||axis=='vertically') +jQuery(el).css({top:clientScroll.t+((Math.max(clientScroll.h,clientScroll.ih)-clientScroll.t-windowSize.hb)/2)+'px'});if(!axis||axis=='horizontally') +jQuery(el).css({left:clientScroll.l+((Math.max(clientScroll.w,clientScroll.iw)-clientScroll.l-windowSize.wb)/2)+'px'});},fixPNG:function(el,emptyGIF){var images=jQuery('img[@src*="png"]',el||document),png;images.each(function(){png=this.src;this.src=emptyGIF;this.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+png+"')";});}};[].indexOf||(Array.prototype.indexOf=function(v,n){n=(n==null)?0:n;var m=this.length;for(var i=n;icontentObj.offsetHeight){ + height = contentObj.offsetHeight; + rerunFunction = false; + } + if(height<=1){ + height = 1; + rerunFunction = false; + } + + obj.style.height = height + 'px'; + var topPos = height - contentObj.offsetHeight; + if(topPos>0)topPos=0; + contentObj.style.top = topPos + 'px'; + if(rerunFunction){ + setTimeout('slideContent(' + inputId + ',' + direction + ')',dhtmlgoodies_timer); + }else{ + if(height<=1){ + obj.style.display='none'; + if(objectIdToSlideDown && objectIdToSlideDown!=inputId){ + document.getElementById('dhtmlgoodies_a' + objectIdToSlideDown).style.display='block'; + document.getElementById('dhtmlgoodies_a' + objectIdToSlideDown).style.visibility='visible'; + slideContent(objectIdToSlideDown,dhtmlgoodies_slideSpeed); + }else{ + dhtmlgoodies_slideInProgress = false; + } + }else{ + dhtmlgoodies_activeId = inputId; + dhtmlgoodies_slideInProgress = false; + } + } +} + +function initShowHideDivs() +{ + var divs = document.getElementsByTagName('DIV'); + var divCounter = 1; + for(var no=0;no +
    +

    + +
    diff --git a/modules/sharephoto/views/sharephoto.html.php b/modules/sharephoto/views/sharephoto.html.php new file mode 100644 index 00000000..c2b138d9 --- /dev/null +++ b/modules/sharephoto/views/sharephoto.html.php @@ -0,0 +1,71 @@ + +
    + + + + + + + + + +
    diff --git a/modules/tag_cloud/controllers/admin_tag_cloud.php b/modules/tag_cloud/controllers/admin_tag_cloud.php index 4c00238f..777b9b7c 100644 --- a/modules/tag_cloud/controllers/admin_tag_cloud.php +++ b/modules/tag_cloud/controllers/admin_tag_cloud.php @@ -43,6 +43,7 @@ class Admin_Tag_Cloud_Controller extends Admin_Controller { } if ($valid) { module::set_var("tag_cloud", "tagcolor", $options->tagcolor->value); + module::set_var("tag_cloud", "mouseover", $options->mouseover->value); module::set_var("tag_cloud", "background_color", $options->background_color->value); module::set_var("tag_cloud", "transparent", $options->transparent->value); module::set_var("tag_cloud", "speed", $options->speed->value); @@ -67,6 +68,10 @@ class Admin_Tag_Cloud_Controller extends Admin_Controller { ->value(module::get_var("tag_cloud", "tagcolor", "0x333333")) ->error_message("not_valid", t("The color value must be specified as '0xhhhhhh'")) ->rules("required|length[8]"); + $group->input("mouseover") ->label(t("Tag mouseover color")) + ->value(module::get_var("tag_cloud", "mouseover", "0x000000")) + ->error_message("not_valid", t("The color value must be specified as '0xhhhhhh'")) + ->rules("required|length[8]"); $group->input("background_color")->label(t("Background color")) ->value(module::get_var("tag_cloud", "background_color", "0xffffff")) ->error_message("not_valid", t("The color value must be specified as '0xhhhhhh'")) diff --git a/modules/tag_cloud/helpers/tag_cloud_block.php b/modules/tag_cloud/helpers/tag_cloud_block.php index 5145a2a7..073056ed 100644 --- a/modules/tag_cloud/helpers/tag_cloud_block.php +++ b/modules/tag_cloud/helpers/tag_cloud_block.php @@ -28,7 +28,7 @@ class tag_cloud_block { switch ($block_id) { case "tag_cloud_site": $options = array(); - foreach (array("tagcolor", "background_color", "transparent", "speed", "distribution") + foreach (array("tagcolor", "background_color", "mouseover", "transparent", "speed", "distribution") as $option) { $value = module::get_var("tag_cloud", $option, null); if (!empty($value)) { @@ -36,6 +36,9 @@ class tag_cloud_block { case "tagcolor": $options["tcolor"] = $value; break; + case "mouseover": + $options["hicolor"] = $value; + break; case "background_color": $options["bgColor"] = $value; break; diff --git a/modules/tag_cloud/js/tag_cloud.js b/modules/tag_cloud/js/tag_cloud.js index dcb8a53b..006b2949 100644 --- a/modules/tag_cloud/js/tag_cloud.js +++ b/modules/tag_cloud/js/tag_cloud.js @@ -26,7 +26,7 @@ success: function(data) { if (data.result == "success") { $.get($("#g-tag-cloud").attr("ref"), function(data, textStatus) { - swfobject.removeSWF("g-tag-cloud-movie"); + $("#g-tag-cloud-movie").remove(); $("#g-tag-cloud").append("
    " + data + "
    "); self._set_tag_cloud(); }); @@ -39,9 +39,14 @@ _set_tag_cloud: function() { var self = this; + var taglist = $("#g-tag-cloud a"); + + if (taglist.length == 0) { + return; + } var width = $("#g-tag-cloud").width(); var tags = document.createElement("tags"); - $("#g-tag-cloud a").each(function(i) { + taglist.each(function(i) { var addr = $(this).clone(); $(addr).attr("style", "font-size: 14pt;"); $(tags).append(addr); diff --git a/modules/tagfaces/js/jquery.Jcrop.js b/modules/tagfaces/js/jquery.Jcrop.js index ad261f97..d938e203 100644 --- a/modules/tagfaces/js/jquery.Jcrop.js +++ b/modules/tagfaces/js/jquery.Jcrop.js @@ -105,7 +105,7 @@ $.Jcrop = function(obj,opt) // Initialize some jQuery objects {{{ var $origimg = $(obj); - var $img = $origimg.clone().removeAttr('id').css({ position: 'absolute' }); + var $img = $origimg.clone().removeAttr('id').css({ position: 'static' }); $img.width($origimg.width()); $img.height($origimg.height()); diff --git a/modules/tagfaces/views/drawfaces.html.php b/modules/tagfaces/views/drawfaces.html.php index 981854c8..2dc9800f 100644 --- a/modules/tagfaces/views/drawfaces.html.php +++ b/modules/tagfaces/views/drawfaces.html.php @@ -6,20 +6,20 @@ .jcrop-vline, .jcrop-hline { - font-size: 0; - position: absolute; - background: white url('') top left repeat; + font-size: 0; + position: absolute; + background: white url('') top left repeat; } .jcrop-vline { height: 100%; width: 1px !important; } .jcrop-hline { width: 100%; height: 1px !important; } .jcrop-handle { - font-size: 1px; - width: 7px !important; - height: 7px !important; - border: 1px #eee solid; - background-color: #333; - *width: 9px; - *height: 9px; + font-size: 1px; + width: 7px !important; + height: 7px !important; + border: 1px #eee solid; + background-color: #333; + *width: 9px; + *height: 9px; } .jcrop-tracker { width: 100%; height: 100%; } @@ -27,14 +27,14 @@ .custom .jcrop-vline, .custom .jcrop-hline { - background: yellow; + background: yellow; } .custom .jcrop-handle { - border-color: black; - background-color: #C7BB00; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; + border-color: black; + background-color: #C7BB00; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; } @@ -60,30 +60,42 @@ }; -
    -
    - dynamic_top() ?> -
    -

    -
    -

    -
    -
    -
    -

    title) ?>

    -
    -
    - resize_img(array("id" => "g-photo-id-{$item->id}", "class" => "g-resize")) ?> -
    + + + + +
    + dynamic_top() ?> +
    +

    +

    + resize_img(array("id" => "g-select-photo-id-{$item->id}", "class" => "g-select-resize", "style" => "position: fixed;")) ?>
    -
    + @@ -66,8 +58,6 @@ 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() they get combined */ ?> @@ -87,27 +77,30 @@ site_status() ?>
    - user_menu() ?> - header_top() ?> - -
    - admin): ?> - site_menu() ?> - + user_menu() ?> + header_top() ?> + + + + + header_bottom() ?>
    - + item() && !empty($parents)): ?>
      + -
    • + > + + + +
      + photo_top() ?> + + paginator() ?> + + + +
      +

      title) ?>

      +
      description)) ?>
      +
      + + photo_bottom() ?> +
      diff --git a/themes/stopdesign/views/sidebar.html.php b/themes/browny_wind/views/sidebar.html.php similarity index 100% rename from themes/stopdesign/views/sidebar.html.php rename to themes/browny_wind/views/sidebar.html.php diff --git a/themes/greydragon/views/page.html.php b/themes/greydragon/views/page.html.php index 05481c29..90a9f09c 100644 --- a/themes/greydragon/views/page.html.php +++ b/themes/greydragon/views/page.html.php @@ -5,8 +5,8 @@ - - - - + + + " type="image/x-icon" /> @@ -87,7 +88,7 @@ guest): ?>
      - site_menu() ?> + site_menu("") ?>
      messages() ?> @@ -146,7 +147,7 @@ ' ?> - + page_subtype != "login") && ($sidebarvisible != "none")): ?> @@ -174,7 +175,7 @@
        credits() ?> " . $ini["name"] . ""; print "\n
      • ©" . $ini["author"] . "
        • "; @@ -190,7 +191,7 @@
    page_bottom() ?> - + // // <bgsound src="/music/collection.m3u"> // diff --git a/themes/okat_dark/admin/helpers/three_nids_event.php b/themes/okat_dark/admin/helpers/three_nids_event.php deleted file mode 100644 index c8a0db51..00000000 --- a/themes/okat_dark/admin/helpers/three_nids_event.php +++ /dev/null @@ -1,42 +0,0 @@ -group("three_nids")->label(t("3nids Theme Settings")); - $group->input("title") - ->rules("required") - ->label(t("item title : parent or item.")) - ->value(module::get_var("three_nids", "title")); - $group->input("description") - ->rules("required") - ->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")); - $group->input("photo_size") - ->rules("required") - ->label(t("Photo size: resize or full.")) - ->value(module::get_var("three_nids", "photo_size")); - } - - static function theme_edit_form_completed($form) { - module::set_var("three_nids", "description", $form->three_nids->description->value); - module::set_var("three_nids", "title", $form->three_nids->title->value); - module::set_var("three_nids", "photo_size", $form->three_nids->photo_size->value); - } -} \ No newline at end of file diff --git a/themes/okat_dark/css/jquery.fancybox.css b/themes/okat_dark/css/jquery.fancybox.css deleted file mode 100644 index 35fe8bea..00000000 --- a/themes/okat_dark/css/jquery.fancybox.css +++ /dev/null @@ -1,658 +0,0 @@ -html, body { - height: 100%; -} - -div#fancy_overlay { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - background-color: black; - display: none; - z-index: 30; -} - -* html div#fancy_overlay { - position: absolute; - height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); -} - -div#fancy_wrap { - text-align: middle; -} - -div#fancy_loading { - position: absolute; - height: 40px; - width: 40px; - cursor: pointer; - display: none; - overflow: hidden; - background: transparent; - z-index: 100; -} - -div#fancy_loading div { - position: absolute; - top: 0; - left: 0; - width: 40px; - height: 480px; - background: transparent url('../images/fancy_progress.png') no-repeat; -} - -div#fancy_loading_overlay { - position: absolute; - background-color: #FFF; - z-index: 30; -} - -div#fancy_outer { - position: absolute; - top: 0; - left: 0; - z-index: 90; - padding: 18px 18px 20px 0px; - margin: 0; - overflow: hidden; - background: transparent; - display: none; -} - -div#fancy_inner { - position: relative; - width:100%; - height:100%; - border: 1px solid #BBB; - background: #FFF; -} - -div#fancy_content { - margin: 0; - z-index: 100; - position: absolute; -} - -div#fancy_div { - background: #000; - color: #FFF; - height: 100%; - width: 100%; - z-index: 100; -} - -img#fancy_img { - position: absolute; - top: 0; - left: 0; - border:0; - padding: 0; - margin: 0; - z-index: 100; - width: 100%; - height: 100%; -} - -div#fancy_close { - position: absolute; - top: -12px; - right: -15px; - height: 30px; - width: 30px; - background: url('../images/fancy_closebox.png') top left no-repeat; - cursor: pointer; - z-index: 181; - display: none; -} - -#fancy_frame { - position: relative; - width: 100%; - height: 100%; - display: none; -} - -#fancy_ajax { - width: 100%; - height: 100%; - overflow: auto; -} - -a#fancy_left, a#fancy_right { - position: absolute; - top: 15px; - height: 50px; - width: 30%; - cursor: pointer; - z-index: 111; - display: none; - background-image: url('data:image/gif;base64,AAAA'); - outline: none; -} - -a#fancy_left { - left: 0px; -} - -a#fancy_right { - right: 0px; -} - -span.fancy_ico { - position: absolute; - top: 50%; - margin-top: -15px; - width: 30px; - height: 30px; - z-index: 112; - cursor: pointer; - display: block; -} - -span#fancy_left_ico { - left: -9999px; - background: transparent url('../images/fancy_left.png') no-repeat; -} - -span#fancy_right_ico { - right: -9999px; - background: transparent url('../images/fancy_right.png') no-repeat; -} - -a#fancy_left:hover { - visibility: visible; -} - -a#fancy_right:hover { - visibility: visible; -} - -a#fancy_left:hover span { - left: 20px; -} - -a#fancy_right:hover span { - right: 20px; -} - -.fancy_bigIframe { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - background: transparent; -} - -div#fancy_bg { - position: absolute; - top: 0; left: 0; - width: 100%; - height: 100%; - z-index: 70; - border: 0; - padding: 0; - margin: 0; -} - -div.fancy_bg { - position: absolute; - display: block; - z-index: 70; - border: 0; - padding: 0; - margin: 0; -} - -div.fancy_bg_n { - top: -18px; - width: 100%; - height: 18px; - background: transparent url('../images/fancy_shadow_n.png') repeat-x; -} - -div.fancy_bg_ne { - top: -18px; - right: -13px; - width: 13px; - height: 18px; - background: transparent url('../images/fancy_shadow_ne.png') no-repeat; -} - -div.fancy_bg_e { - right: -13px; - height: 100%; - width: 13px; - background: transparent url('../images/fancy_shadow_e.png') repeat-y; -} - -div.fancy_bg_se { - bottom: -18px; - right: -13px; - width: 13px; - height: 18px; - background: transparent url('../images/fancy_shadow_se.png') no-repeat; -} - -div.fancy_bg_s { - bottom: -18px; - width: 100%; - height: 18px; - background: transparent url('../images/fancy_shadow_s.png') repeat-x; -} - -div.fancy_bg_sw { - bottom: -18px; - left: -13px; - width: 13px; - height: 18px; - background: transparent url('../images/fancy_shadow_sw.png') no-repeat; -} - -div.fancy_bg_w { - left: -13px; - height: 100%; - width: 13px; - background: transparent url('../images/fancy_shadow_w.png') repeat-y; -} - -div.fancy_bg_nw { - top: -18px; - left: -13px; - width: 13px; - height: 18px; - background: transparent url('../images/fancy_shadow_nw.png') no-repeat; -} - -div#fancy_title { - position: absolute; - bottom: -20px; - left: 0; - z-index: 100; - display: none; -} - -div#fancy_title div { - color: #FFF; - font: bold 10px Arial; - padding-bottom: 3px; -} - -div#fancy_title table { - margin: 0 auto; -} - -div#fancy_title table td { - padding: 0; - vertical-align: middle; -} - -td#fancy_title_left { - height: 32px; - width: 15px; - background: transparent url('../images/fancy_title_left.png') repeat-x; -} - -td#fancy_title_main { - height: 32px; - background: transparent url('../images/fancy_title_main.png') repeat-x; -} - -td#fancy_title_right { - height: 32px; - width: 15px; - background: transparent url('../images/fancy_title_right.png') repeat-x; -} - -div#fancy_modules { - position: absolute; - bottom: -20px; - right: 0px; - z-index: 100; - display: none; -} -div#fancy_modules div { - color: #FFF; - font: bold 10px Arial; - padding-bottom: 3px; -} - -div#fancy_modules table { - margin: 0 auto; -} - -div#fancy_modules table td { - padding: 0; - vertical-align: middle; -} - -td#fancy_modules_left { - border-color: #333333; - height: 32px; - width: 15px; - background: transparent url('../images/fancy_title_left.png') repeat-x; -} - -td#fancy_modules_main { - border-color: #333333; - height: 32px; - background: transparent url('../images/fancy_title_main.png') repeat-x; -} - -td#fancy_modules_right { - border-color: #333333; - height: 32px; - width: 15px; - background: transparent url('../images/fancy_title_right.png') repeat-x; -} - -/* ************************************************* */ -/* ************************************************* */ -/* ************************************************* */ -/* ************************************************* */ - -div#mod_overlay { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - background-color: black; - display: none; - z-index: 1030; -} - -* html div#mod_overlay { - position: absolute; - height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); -} - -div#mod_wrap { - text-align: middle; -} - -div#mod_loading { - position: absolute; - height: 40px; - width: 40px; - cursor: pointer; - display: none; - overflow: hidden; - background: transparent; - z-index: 10100; -} - -div#mod_loading div { - position: absolute; - top: 0; - left: 0; - width: 40px; - height: 480px; - background: transparent url('../images/fancy_progress.png') no-repeat; -} - -div#mod_loading_overlay { - position: absolute; - background-color: #FFF; - z-index: 1030; -} - -div#mod_outer { - position: absolute; - top: 0; - left: 0; - z-index: 1090; - padding: 18px 18px 20px 0px; - margin: 0; - overflow: hidden; - background: transparent; - display: none; -} - -div#mod_inner { - position: relative; - width:100%; - height:100%; - border: 1px solid #BBB; - background: #FFF; -} - -div#mod_content { - margin: 0; - z-index: 10100; - position: absolute; -} - -div#mod_div { - background: #000; - color: #FFF; - height: 100%; - width: 100%; - z-index: 10100; -} - -img#mod_img { - position: absolute; - top: 0; - left: 0; - border:0; - padding: 0; - margin: 0; - z-index: 10100; - width: 100%; - height: 100%; -} - -div#mod_close { - position: absolute; - top: -12px; - right: -15px; - height: 30px; - width: 30px; - background: url('../images/fancy_closebox.png') top left no-repeat; - cursor: pointer; - z-index: 10181; - display: none; -} - -#mod_frame { - position: relative; - width: 100%; - height: 100%; - display: none; -} - -#mod_ajax { - width: 100%; - height: 100%; - overflow: auto; -} - -a#mod_left, a#mod_right { - position: absolute; - bottom: 0px; - height: 100%; - width: 35%; - cursor: pointer; - z-index: 10111; - display: none; - background-image: url('data:image/gif;base64,AAAA'); - outline: none; -} - -a#mod_left { - left: 0px; -} - -a#mod_right { - right: 0px; -} - -span.mod_ico { - position: absolute; - top: 50%; - margin-top: -15px; - width: 30px; - height: 30px; - z-index: 10112; - cursor: pointer; - display: block; -} - -span#mod_left_ico { - left: -9999px; - background: transparent url('../images/fancy_left.png') no-repeat; -} - -span#mod_right_ico { - right: -9999px; - background: transparent url('../images/fancy_right.png') no-repeat; -} - -a#mod_left:hover { - visibility: visible; -} - -a#mod_right:hover { - visibility: visible; -} - -a#mod_left:hover span { - left: 20px; -} - -a#mod_right:hover span { - right: 20px; -} - -.mod_bigIframe { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - background: transparent; -} - -div#mod_bg { - position: absolute; - top: 0; left: 0; - width: 100%; - height: 100%; - z-index: 1070; - border: 0; - padding: 0; - margin: 0; -} - -div.mod_bg { - position: absolute; - display: block; - z-index: 1070; - border: 0; - padding: 0; - margin: 0; -} - -div.mod_bg_n { - top: -18px; - width: 100%; - height: 18px; - background: transparent url('../images/fancy_shadow_n.png') repeat-x; -} - -div.mod_bg_ne { - top: -18px; - right: -13px; - width: 13px; - height: 18px; - background: transparent url('../images/fancy_shadow_ne.png') no-repeat; -} - -div.mod_bg_e { - right: -13px; - height: 100%; - width: 13px; - background: transparent url('../images/fancy_shadow_e.png') repeat-y; -} - -div.mod_bg_se { - bottom: -18px; - right: -13px; - width: 13px; - height: 18px; - background: transparent url('../images/fancy_shadow_se.png') no-repeat; -} - -div.mod_bg_s { - bottom: -18px; - width: 100%; - height: 18px; - background: transparent url('../images/fancy_shadow_s.png') repeat-x; -} - -div.mod_bg_sw { - bottom: -18px; - left: -13px; - width: 13px; - height: 18px; - background: transparent url('../images/fancy_shadow_sw.png') no-repeat; -} - -div.mod_bg_w { - left: -13px; - height: 100%; - width: 13px; - background: transparent url('../images/fancy_shadow_w.png') repeat-y; -} - -div.mod_bg_nw { - top: -18px; - left: -13px; - width: 13px; - height: 18px; - background: transparent url('../images/fancy_shadow_nw.png') no-repeat; -} - -div#mod_title { - position: absolute; - bottom: -20px; - left: 0; - z-index: 10100; - display: none; -} - -div#mod_title div { - color: #FFF; - font: bold 10px Arial; - padding-bottom: 3px; -} - -div#mod_title table { - margin: 0 auto; -} - -div#mod_title table td { - padding: 0; - vertical-align: middle; -} - -td#mod_title_left { - height: 32px; - width: 15px; - background: transparent url('../images/fancy_title_left.png') repeat-x; -} - -td#mod_title_main { - height: 32px; - background: transparent url('../images/fancy_title_main.png') repeat-x; -} - -td#mod_title_right { - height: 32px; - width: 15px; - background: transparent url('../images/fancy_title_right.png') repeat-x; -} - - diff --git a/themes/okat_dark/css/screen.css b/themes/okat_dark/css/screen.css deleted file mode 100644 index da31e1f5..00000000 --- a/themes/okat_dark/css/screen.css +++ /dev/null @@ -1,847 +0,0 @@ -/** - * Gallery 3 Default Theme Screen Styles - * - * @requires YUI reset, font, grids CSS - * - * Sheet organization: - * 1) Basic HTML elements - * 2) Reusable content blocks - * 3) Page layout containers - * 4) Content blocks in specific layout containers - * 5) Navigation and menus - * 6) Browser hacks - * 7) jQuery and jQuery UI - * 8) Right-to-left language styles - */ - -/** ******************************************************************* - * 1) Basic HTML elements - **********************************************************************/ - -body, html { - background-color: #000000; - font-family: 'Corbel', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif; - color: #e8e8e8; -} - -p { - margin-bottom: 1em; -} - -em { - font-style: oblique; -} - -h1, h2, h3, h4, h5, strong, th { - font-weight: none; -} - -h1 { - font-size: 1.2em; -} -h2{ - font-size: 1.1em; - color: #ffffff; -} - -#g-search-results h1 { - margin-bottom: 1em; -} - -#g-progress h1 { - font-size: 1.1em; -} - -#g-sidebar .g-block h2 { - font-size: 1.2em; -} - -#g-sidebar .g-block li { - margin-bottom: .6em; -} - -h3 { - font-size: 1.2em; -} -h4 { - font-size: 0.9em; -} - -/* Links ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - -a, -.g-menu a, -#g-dialog a, -.g-button, -.g-button:hover, -.g-button:active, -a.ui-state-hover, -input.ui-state-hover, -button.ui-state-hover { - color: #eeeeee !important; - cursor: pointer !important; - text-decoration: none; - -moz-outline-style: none; -} - -#g-button{ - font-size: 0.4em; -} - -a:hover, -#g-dialog a:hover { - text-decoration: underline; -} - -.g-menu a:hover { - text-decoration: none; - font-size: 0.4em; -} - -#g-dialog #g-action-status li { - width: 400px; - white-space: normal; - padding-left: 32px; -} - -/* Tables ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - -table { - width: 100%; -} - -#g-content table { - margin: 1em 0; -} - -caption, -th { - text-align: left; -} - -th, -td { - border: none; - border-bottom: 1px solid #ccc; - padding: .5em; - vertical-align: top; -} - -/* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - -fieldset { - border: 1px solid #ccc; - padding-bottom: .8em; -} - -#g-banner fieldset, -#g-sidebar fieldset, -.g-short-form fieldset { - border: none; -} - -legend { - font-weight: bold; - margin-left: 1em; - color: #e8e8e8; -} - -#g-banner legend, -#g-sidebar legend, -#g-content #g-search-form legend, -input[type="hidden"], -.g-short-form label { - display: none; -} - -label { - cursor: help; -} - -input[type="text"], -input[type="password"] { - width: 50%; -} - -input[type="text"], -input[type="password"], -textarea { - border: 1px solid #e8e8e8; - border-top-color: #ccc; - border-left-color: #ccc; - color: #333; -} - -textarea { - width: 90%; - height: 12em; -} - -input:focus, -textarea:focus, -option:focus { - background-color: #ffc; - color: #000; -} - -/* Form layout ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - -form li { - margin: 0 !important; - padding: .3em 1.5em .3em 1em; -} - -form ul ul { - clear: both; -} - -form ul ul li { - float: left; -} - -input, -select, -textarea { - display: block; - clear: both; - padding: .2em; -} - -input[type="submit"], -input[type="reset"] { - display: inline; - clear: none; - float: left; -} - -/* Form validation ~~~~~~~~~~~~~~~~~~~~~~~ */ - -form.g-error input[type="text"], -li.g-error input[type="text"], -form.g-error input[type="password"], -li.g-error input[type="password"], -form.g-error input[type="checkbox"], -li.g-error input[type="checkbox"], -form.g-error input[type="radio"], -li.g-error input[type="radio"], -form.g-error textarea, -li.g-error textarea, -form.g-error select, -li.g-error select { - border: 2px solid red; -} - -/** ******************************************************************* - * 2) Reusable content blocks - *********************************************************************/ - -.g-block h2 { - background-color: #333; - padding: .3em .8em; -} - -.g-block-content { - margin-top: 1em; -} - -/* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */ - -/* Inline layout (forms, lists) ~~~~~~~~~~ */ - -.g-short-form li { - float: left; - padding: .4em 0; -} - -.g-short-form input[type="text"] { - color: #666; - padding: .3em .6em; - width: 11em; -} - -/*** ****************************************************************** - * 3) Page layout containers - *********************************************************************/ - -/* View container ~~~~~~~~~~~~~~~~~~~~~~~~ */ - -.g-view { - background-color: #4C4C4C; - border: 1px solid #e8e8e8; - border-bottom: none; -} - -/* Layout containers ~~~~~~~~~~~~~~~~~~~~~ */ - -#g-header { - margin-bottom: 1em; - background-color: #484848; - border-bottom: 1px solid #e8e8e8; -} - -#g-banner { - background-color: #333333; - border-bottom: 1px solid #e8e8e8; - font-size: .8em; - min-height: 5em; - padding: 1em 20px; - position: relative; -} - -#g-content { - font-size: 1.2em; - padding-left: 20px; - position: relative; - width: 95%; -} - -#g-sidebar { - background-color: #333333; - font-size: .9em; - margin-right: 10px; - padding: 0 20px; - width: 220px; -} - -#g-footer { - background-color: #484848; - border-top: 1px solid #ccc; - font-size: .8em; - margin-top: 20px; - padding: 10px 20px; -} - -/** ******************************************************************* - * 4) Content blocks in specific layout containers - *********************************************************************/ - -/* Header ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - -#g-banner #g-logo img { - margin: 0; -} - -#g-banner #g-quick-search-form { - clear: right; - float: right; - margin-top: 1em; -} - -#g-banner #g-quick-search-form input[type='text'] { - width: 17em; -} - -#g-content .g-block h2 { - background-color: transparent; - padding-left: 0; -} - -#g-sidebar .g-block-content { - padding-left: 1em; -} - -/* Album content ~~~~~~~~~~~~~~~~~~~~~~~~~ */ - -#g-content #g-album-grid { - margin: 1em 0; - position: relative; - z-index: 1; -} - -#g-content #g-album-grid .g-item { - background-color: #484848; - border: 1px solid #000000; - margin: 2px; - float: left; - font-size: .7em; - padding: .6em 8px; - position: relative; - text-align: center; - width: 110px; - height: 140px; - z-index: 1; -} - -#g-content #g-album-grid .g-item h2 { - margin: 5px 0; -} - -#g-content .g-photo h2, -#g-content .g-item .g-metadata { - color: #ffffcc; - display: none; - margin-bottom: .6em; -} - -#g-content #g-album-grid .g-album { - background-color: #484848; -} - -#g-content #g-album-grid .g-album h2 span { - background: transparent url('../images/ico-album.png') no-repeat top left; - display: inline-block; - height: 16px; - margin-right: 5px; - width: 16px; -} - -#g-content #g-album-grid .g-hover-item { - background-color: #000; - position: absolute !important; - z-index: 1000 !important; - border: 1px solid #FFFFFF; -} - -#g-content .g-hover-item h2, -#g-content .g-hover-item .g-metadata { - display: block; -} - -#g-content #g-album-grid #g-place-holder { - position: relative; - visibility: hidden; - z-index: 1; -} - -/* Individual photo content ~~~~~~~~~~~~~~ */ - -#g-content #g-item { - position: relative; - width: 100%; -} - -#g-content #g-photo { - position: relative; -} - -#g-content #g-item .g-fullsize-link img { - display: block; - margin: 1em auto !important; -} - -#g-comments { - margin-top: 2em; - position: relative; -} - -#g-comments ul li { - margin: 1em 0; -} - -#g-comments .g-author { - border-bottom: 1px solid #ccc; - color: #999; - height: 32px; - line-height: 32px; -} - -#g-comments ul li div { - padding: 0 8px 8px 43px; -} - -#g-comments ul li #g-recaptcha { - padding: 0; -} - -#g-comments ul li #g-recaptcha div { - padding: 0; -} - -#g-comments .g-avatar { - height: 32px; - margin-right: .4em; - width: 32px; -} - -#g-admin-comment-button { - position: absolute; - right: 0; - top: 2px; -} - -#g-content #g-comment-form { - margin-top: 2em; -} - -/* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */ - -#g-footer #g-credits li { - padding-right: 1.2em; -} - -#g-content #g-search-results { - margin-top: 1em; - padding-top: 1em; -} - -/* In-line editing ~~~~~~~~~~~~~~~~~~~~~ */ -#g-in-place-edit-message { - background-color: #FFF; -} - -/** ******************************************************************* - * 5) Navigation and menus - *********************************************************************/ - -#g-site-menu, -#g-tag-cloud ul { - font-size: 1.2em; -} - -/* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - -#g-banner #g-login-menu { - color: #999; - float: right; -} - -#g-banner #g-login-menu li { - padding-left: 1.2em; -} - -/* Site Menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - -#g-site-menu { - bottom: 0; - display: none; - left: 300px; - position: absolute; -} - -#g-site-menu ul { - margin-bottom: 0 !important; -} - -/* Context Menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - -.g-context-menu { - font-size: 0.6em; - background-color: #fff; - bottom: 0; - left: 0; - position: absolute; -} - -.g-item .g-context-menu { - display: none; - margin-top: 2em; - width: 100%; -} - -#g-item .g-context-menu { - font-size: .7em; -} - -#g-item .g-context-menu ul { - display: none; -} - -.g-context-menu li { - border-left: none; - border-right: none; - border-bottom: none; -} - -.g-context-menu li a { - display: block; - line-height: 1.6em; -} - -.g-hover-item .g-context-menu { - display: block; -} - -.g-hover-item .g-context-menu li { - text-align: left; -} - -.g-hover-item .g-context-menu a:hover { - text-decoration: none; -} - -/* View Menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - -#g-view-menu { - margin-bottom: 1em; -} - -#g-view-menu a { - background-repeat: no-repeat; - background-position: 50% 50%; - height: 28px !important; - width: 43px !important; -} - -#g-view-menu #g-slideshow-link { - background-image: url('../images/ico-view-slideshow.png'); -} - -#g-view-menu .g-fullsize-link { - background-image: url('../images/ico-view-fullsize.png'); -} - -#g-view-menu #g-comments-link { - background-image: url('../images/ico-view-comments.png'); -} - -#g-view-menu #g-print-digibug-link { - background-image: url('../images/ico-print.png'); -} - -/* Tags and cloud ~~~~~~~~~~~~~~~~~~~~~~~~ */ - -#g-tag-cloud ul { - text-align: justify; -} - -#g-tag-cloud ul li { - display: inline; - line-height: 1.5em; - text-align: justify; -} - -#g-tag-cloud ul li a { - text-decoration: none; -} - -#g-tag-cloud ul li span { - display: none; -} - -#g-tag-cloud ul li.size1 a { - color: #9cf; - font-size: 80%; - font-weight: 100; -} - -#g-tag-cloud ul li.size2 a { - color: #69f; - font-size: 90%; - font-weight: 300; -} - -#g-tag-cloud ul li.size3 a { - color: #69c; - font-size: 100%; - font-weight: 500; -} - -#g-tag-cloud ul li.size4 a { - color: #369; - font-size: 110%; - font-weight: 700; -} - -#g-tag-cloud ul li.size5 a { - color: #0e2b52; - font-size: 120%; - font-weight: 900; -} - -#g-tag-cloud ul li.size6 a { - color: #0e2b52; - font-size: 130%; - font-weight: 900; -} - -#g-tag-cloud ul li.size7 a { - color: #0e2b52; - font-size: 140%; - font-weight: 900; -} - -#g-tag-cloud ul li a:hover { - color: #f30; - text-decoration: underline; -} - -#g-welcome-message p { - padding-bottom: 1em; -} - -/** ******************************************************************* - * 6) jQuery and jQuery UI - *********************************************************************/ - -/* Superfish menu overrides ~~~~~~~~~~~~~~ */ - -.sf-menu a { - font-size: 0.1em; - color: #fff; - border-left: 1px solid #e8e8e8; - border-top: 1px solid #e8e8e8; -} - -.sf-menu li { - color: #fff; - background-color: #333; - -} - -.sf-menu li li, .sf-menu li li ul li { - color: #fff; - background-color: #333; -} - -.sf-menu li:hover { - color: #eee; - background-color: #777; - -} - -.sf-menu li:hover, .sf-menu li.sfHover, -.sf-menu a:focus, .sf-menu a:hover, .sf-menu a:active { - background: #777; -} - -/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */ - -.ui-widget-overlay { - background: #000; - opacity: .7; -} - -/* jQuery UI ThemeRoller buttons */ - -.g-buttonset { - padding-left: 1px; -} - -.g-buttonset li { - float: left; -} - -.g-buttonset .g-button { - margin: 0; -} - -.ui-icon-left .ui-icon { - float: left; - margin-right: .2em; -} - -.ui-icon-right .ui-icon { - float: right; - margin-left: .2em; -} - -.ui-icon-rotate-ccw { - background-position: -192px -64px; -} - -.ui-icon-rotate-cw { - background-position: -208px -64px; -} - -/* STUFF THAT NEEDS A HOME */ - -#g-move ul { - padding-left: 1em; -} - -#g-move .selected { - background: #999; -} - - -/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - -#g-edit-permissions-form { - clear: both; -} - -#g-edit-permissions-form td { - background-image: none; -} - -#g-edit-permissions-form fieldset { - border: 1px solid #ccc; - padding: 0; -} - -#g-permissions .g-denied, -#g-permissions .g-allowed { - text-align: center; - vertical-align: middle; -} - -#g-permissions .g-denied { - background-color: #fcc; -} - -#g-permissions .g-allowed { - background-color: #cfc; -} - -/*************** STUFF THAT NEEDS A HOME ****************/ -#g-uploadifyUploader { - color: #000000; -} - - -#g-admin-g2-import-notes { - padding-bottom: 20px; -} - -#g-admin-g2-import-details { - padding-top: 20px; -} - -#g-admin-g2-import-details .g-warning { - margin-top: 4px; -} - -#g-admin-g2-import-details .g-info { - padding: 2px; - border: 1px solid #999; - margin-bottom: 10px; -} - -#g-admin-g2-import-notes p, -#g-admin-g2-import-details .g-info p { - padding: 0; - margin: 0; -} - -#g-admin-g2-import-notes ul li, -#g-admin-g2-import .g-info ul li { - padding-left: 0; - margin-left: 20px; - list-style-type: disc; -} - -/* Right to left styles ~~~~~~~~~~~~~~~~~~~~ */ - -.rtl { - direction: rtl; -} - -.rtl caption, -.rtl th, -.rtl #g-dialog { - text-align: right; -} - -.rtl .g-right, -.rtl #g-header #g-quick-search-form, -.rtl #g-header #g-login-menu, -.rtl .ui-icon-right .ui-icon { - clear: left; - float: left; -} - -.rtl .g-left, -.rtl #g-dialog .g-cancel, -.rtl form ul ul li, -.rtl input[type="submit"], -.rtl input[type="reset"], -.rtl .g-short-form li, -.rtl #g-header #g-logo img, -.rtl #g-content #g-album-grid .g-item, -.rtl #g-site-menu, -.rtl .g-breadcrumbs li, -.rtl .g-pager li, -.rtl .g-buttonset li, -.rtl .ui-icon-left .ui-icon { - float: right; -} diff --git a/themes/okat_dark/css/themeroller/images/ui-bg_flat_0_333333_40x100.png b/themes/okat_dark/css/themeroller/images/ui-bg_flat_0_333333_40x100.png deleted file mode 100644 index 2f2c7a45..00000000 Binary files a/themes/okat_dark/css/themeroller/images/ui-bg_flat_0_333333_40x100.png and /dev/null differ diff --git a/themes/okat_dark/css/themeroller/images/ui-bg_flat_0_484848_40x100.png b/themes/okat_dark/css/themeroller/images/ui-bg_flat_0_484848_40x100.png deleted file mode 100644 index 37979abe..00000000 Binary files a/themes/okat_dark/css/themeroller/images/ui-bg_flat_0_484848_40x100.png and /dev/null differ diff --git a/themes/okat_dark/css/themeroller/images/ui-bg_flat_100_000000_40x100.png b/themes/okat_dark/css/themeroller/images/ui-bg_flat_100_000000_40x100.png deleted file mode 100644 index abdc0108..00000000 Binary files a/themes/okat_dark/css/themeroller/images/ui-bg_flat_100_000000_40x100.png and /dev/null differ diff --git a/themes/okat_dark/css/themeroller/images/ui-bg_flat_100_333333_40x100.png b/themes/okat_dark/css/themeroller/images/ui-bg_flat_100_333333_40x100.png deleted file mode 100644 index 2f2c7a45..00000000 Binary files a/themes/okat_dark/css/themeroller/images/ui-bg_flat_100_333333_40x100.png and /dev/null differ diff --git a/themes/okat_dark/css/themeroller/images/ui-bg_flat_100_484848_40x100.png b/themes/okat_dark/css/themeroller/images/ui-bg_flat_100_484848_40x100.png deleted file mode 100644 index 37979abe..00000000 Binary files a/themes/okat_dark/css/themeroller/images/ui-bg_flat_100_484848_40x100.png and /dev/null differ diff --git a/themes/okat_dark/css/themeroller/images/ui-bg_flat_100_b30000_40x100.png b/themes/okat_dark/css/themeroller/images/ui-bg_flat_100_b30000_40x100.png deleted file mode 100644 index 121651a0..00000000 Binary files a/themes/okat_dark/css/themeroller/images/ui-bg_flat_100_b30000_40x100.png and /dev/null differ diff --git a/themes/okat_dark/css/themeroller/images/ui-bg_flat_55_fbec88_40x100.png b/themes/okat_dark/css/themeroller/images/ui-bg_flat_55_fbec88_40x100.png deleted file mode 100644 index 47acaadd..00000000 Binary files a/themes/okat_dark/css/themeroller/images/ui-bg_flat_55_fbec88_40x100.png and /dev/null differ diff --git a/themes/okat_dark/css/themeroller/images/ui-bg_gloss-wave_16_121212_500x100.png b/themes/okat_dark/css/themeroller/images/ui-bg_gloss-wave_16_121212_500x100.png deleted file mode 100644 index c7a2ee1b..00000000 Binary files a/themes/okat_dark/css/themeroller/images/ui-bg_gloss-wave_16_121212_500x100.png and /dev/null differ diff --git a/themes/okat_dark/css/themeroller/images/ui-bg_highlight-hard_100_333333_1x100.png b/themes/okat_dark/css/themeroller/images/ui-bg_highlight-hard_100_333333_1x100.png deleted file mode 100644 index 254bb228..00000000 Binary files a/themes/okat_dark/css/themeroller/images/ui-bg_highlight-hard_100_333333_1x100.png and /dev/null differ diff --git a/themes/okat_dark/css/themeroller/images/ui-bg_highlight-hard_15_888888_1x100.png b/themes/okat_dark/css/themeroller/images/ui-bg_highlight-hard_15_888888_1x100.png deleted file mode 100644 index 66e53e16..00000000 Binary files a/themes/okat_dark/css/themeroller/images/ui-bg_highlight-hard_15_888888_1x100.png and /dev/null differ diff --git a/themes/okat_dark/css/themeroller/images/ui-bg_highlight-hard_55_555555_1x100.png b/themes/okat_dark/css/themeroller/images/ui-bg_highlight-hard_55_555555_1x100.png deleted file mode 100644 index 1453bc18..00000000 Binary files a/themes/okat_dark/css/themeroller/images/ui-bg_highlight-hard_55_555555_1x100.png and /dev/null differ diff --git a/themes/okat_dark/css/themeroller/images/ui-bg_highlight-soft_35_adadad_1x100.png b/themes/okat_dark/css/themeroller/images/ui-bg_highlight-soft_35_adadad_1x100.png deleted file mode 100644 index 5a5a41d4..00000000 Binary files a/themes/okat_dark/css/themeroller/images/ui-bg_highlight-soft_35_adadad_1x100.png and /dev/null differ diff --git a/themes/okat_dark/css/themeroller/images/ui-bg_highlight-soft_60_dddddd_1x100.png b/themes/okat_dark/css/themeroller/images/ui-bg_highlight-soft_60_dddddd_1x100.png deleted file mode 100644 index 747e1fa6..00000000 Binary files a/themes/okat_dark/css/themeroller/images/ui-bg_highlight-soft_60_dddddd_1x100.png and /dev/null differ diff --git a/themes/okat_dark/css/themeroller/images/ui-bg_inset-soft_15_121212_1x100.png b/themes/okat_dark/css/themeroller/images/ui-bg_inset-soft_15_121212_1x100.png deleted file mode 100644 index e7692acd..00000000 Binary files a/themes/okat_dark/css/themeroller/images/ui-bg_inset-soft_15_121212_1x100.png and /dev/null differ diff --git a/themes/okat_dark/css/themeroller/images/ui-icons_222222_256x240.png b/themes/okat_dark/css/themeroller/images/ui-icons_222222_256x240.png deleted file mode 100644 index ee039dc0..00000000 Binary files a/themes/okat_dark/css/themeroller/images/ui-icons_222222_256x240.png and /dev/null differ diff --git a/themes/okat_dark/css/themeroller/images/ui-icons_333333_256x240.png b/themes/okat_dark/css/themeroller/images/ui-icons_333333_256x240.png deleted file mode 100644 index 379a4064..00000000 Binary files a/themes/okat_dark/css/themeroller/images/ui-icons_333333_256x240.png and /dev/null differ diff --git a/themes/okat_dark/css/themeroller/images/ui-icons_444444_256x240.png b/themes/okat_dark/css/themeroller/images/ui-icons_444444_256x240.png deleted file mode 100644 index 1d071b4e..00000000 Binary files a/themes/okat_dark/css/themeroller/images/ui-icons_444444_256x240.png and /dev/null differ diff --git a/themes/okat_dark/css/themeroller/images/ui-icons_666666_256x240.png b/themes/okat_dark/css/themeroller/images/ui-icons_666666_256x240.png deleted file mode 100644 index 05fae5ee..00000000 Binary files a/themes/okat_dark/css/themeroller/images/ui-icons_666666_256x240.png and /dev/null differ diff --git a/themes/okat_dark/css/themeroller/images/ui-icons_aaaaaa_256x240.png b/themes/okat_dark/css/themeroller/images/ui-icons_aaaaaa_256x240.png deleted file mode 100644 index 9b04537f..00000000 Binary files a/themes/okat_dark/css/themeroller/images/ui-icons_aaaaaa_256x240.png and /dev/null differ diff --git a/themes/okat_dark/css/themeroller/images/ui-icons_bbbbbb_256x240.png b/themes/okat_dark/css/themeroller/images/ui-icons_bbbbbb_256x240.png deleted file mode 100644 index 8340d085..00000000 Binary files a/themes/okat_dark/css/themeroller/images/ui-icons_bbbbbb_256x240.png and /dev/null differ diff --git a/themes/okat_dark/css/themeroller/images/ui-icons_cccccc_256x240.png b/themes/okat_dark/css/themeroller/images/ui-icons_cccccc_256x240.png deleted file mode 100644 index 12774b8f..00000000 Binary files a/themes/okat_dark/css/themeroller/images/ui-icons_cccccc_256x240.png and /dev/null differ diff --git a/themes/okat_dark/css/themeroller/images/ui-icons_cd0a0a_256x240.png b/themes/okat_dark/css/themeroller/images/ui-icons_cd0a0a_256x240.png deleted file mode 100644 index 7930a558..00000000 Binary files a/themes/okat_dark/css/themeroller/images/ui-icons_cd0a0a_256x240.png and /dev/null differ diff --git a/themes/okat_dark/css/themeroller/images/ui-icons_f9bd01_256x240.png b/themes/okat_dark/css/themeroller/images/ui-icons_f9bd01_256x240.png deleted file mode 100644 index 1619b868..00000000 Binary files a/themes/okat_dark/css/themeroller/images/ui-icons_f9bd01_256x240.png and /dev/null differ diff --git a/themes/okat_dark/css/themeroller/images/ui-icons_f9db01_256x240.png b/themes/okat_dark/css/themeroller/images/ui-icons_f9db01_256x240.png deleted file mode 100644 index af18dccc..00000000 Binary files a/themes/okat_dark/css/themeroller/images/ui-icons_f9db01_256x240.png and /dev/null differ diff --git a/themes/okat_dark/css/three_nids.css b/themes/okat_dark/css/three_nids.css deleted file mode 100644 index 27f61a07..00000000 --- a/themes/okat_dark/css/three_nids.css +++ /dev/null @@ -1,54 +0,0 @@ -/* 3nids specific */ -.g-movie { - padding-top: 10px; -} - -.g-map-head img { - display: block; - margin: 3px; -} - -.g-map-head a { - float: right; -} - -.g-comment-thumb{ - padding: 5px; - text-align: left; -} - -.g-fancy-iframe-body{ - background-color: #333333; - height: auto; -} - -#mod_frame{ - background-color: #333333; - } - - .g-comment-box { - border-bottom: 1px solid #555; -} - -.g-comment-box:hover{ - background-color: black; - color: #ffffcc; -} - - #g-comment-detail { - width: 360px; - height: 100%; - background-color: #333333; - padding: 10px; - text-align: left; - margin-top: 30px; -} - -.g-block-content .g-parent-album h4 span { - background: transparent url('../images/ico-album.png') no-repeat top left; - display: inline-block; - height: 16px; - margin-right: 5px; - width: 16px; -} - diff --git a/themes/okat_dark/helpers/three_nids.php b/themes/okat_dark/helpers/three_nids.php deleted file mode 100644 index 65054bfc..00000000 --- a/themes/okat_dark/helpers/three_nids.php +++ /dev/null @@ -1,125 +0,0 @@ -is_movie()){ - $width = $item->width; - $height = $item->height; - }else{ - $width = $item->resize_width; - $height = $item->resize_height; - } - - $description_mode = module::get_var("three_nids", "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("three_nids", "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()){ - $fancymodule = ""; - if (module::is_active("exif")) { - $fancymodule .= "exif::" . url::site("exif/show/{$item->id}") . ";;"; - } - if (module::is_active("comment")) { - $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 . - "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() . "\">"; - } else { - // NOTE: we don't want to open an here because $view_type is "header", but lower down - // we're going to close one, so that's going to generate a mismatch. For now, just open a - // link anyway. - // @todo: figure out what we really should be doing here. - $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; - } - - public function comment_count($item) { - access::required("view", $item); - - return ORM::factory("comment") - ->where("item_id", "=", $item->id) - ->where("state", "=", "published") - ->order_by("created", "DESC") - ->count_all(); - } -} -?> \ No newline at end of file diff --git a/themes/okat_dark/images/avatar.jpg b/themes/okat_dark/images/avatar.jpg deleted file mode 100644 index d08724fc..00000000 Binary files a/themes/okat_dark/images/avatar.jpg and /dev/null differ diff --git a/themes/okat_dark/images/fancy_closebox.png b/themes/okat_dark/images/fancy_closebox.png deleted file mode 100644 index 4de4396d..00000000 Binary files a/themes/okat_dark/images/fancy_closebox.png and /dev/null differ diff --git a/themes/okat_dark/images/fancy_left.png b/themes/okat_dark/images/fancy_left.png deleted file mode 100644 index 61494e63..00000000 Binary files a/themes/okat_dark/images/fancy_left.png and /dev/null differ diff --git a/themes/okat_dark/images/fancy_progress.png b/themes/okat_dark/images/fancy_progress.png deleted file mode 100644 index 06b7c89a..00000000 Binary files a/themes/okat_dark/images/fancy_progress.png and /dev/null differ diff --git a/themes/okat_dark/images/fancy_right.png b/themes/okat_dark/images/fancy_right.png deleted file mode 100644 index 0a56042f..00000000 Binary files a/themes/okat_dark/images/fancy_right.png and /dev/null differ diff --git a/themes/okat_dark/images/fancy_shadow_e.png b/themes/okat_dark/images/fancy_shadow_e.png deleted file mode 100644 index 5db7b2b8..00000000 Binary files a/themes/okat_dark/images/fancy_shadow_e.png and /dev/null differ diff --git a/themes/okat_dark/images/fancy_shadow_n.png b/themes/okat_dark/images/fancy_shadow_n.png deleted file mode 100644 index 4e20abbe..00000000 Binary files a/themes/okat_dark/images/fancy_shadow_n.png and /dev/null differ diff --git a/themes/okat_dark/images/fancy_shadow_ne.png b/themes/okat_dark/images/fancy_shadow_ne.png deleted file mode 100644 index 64ef7225..00000000 Binary files a/themes/okat_dark/images/fancy_shadow_ne.png and /dev/null differ diff --git a/themes/okat_dark/images/fancy_shadow_nw.png b/themes/okat_dark/images/fancy_shadow_nw.png deleted file mode 100644 index 9ef03377..00000000 Binary files a/themes/okat_dark/images/fancy_shadow_nw.png and /dev/null differ diff --git a/themes/okat_dark/images/fancy_shadow_s.png b/themes/okat_dark/images/fancy_shadow_s.png deleted file mode 100644 index bf52bd61..00000000 Binary files a/themes/okat_dark/images/fancy_shadow_s.png and /dev/null differ diff --git a/themes/okat_dark/images/fancy_shadow_se.png b/themes/okat_dark/images/fancy_shadow_se.png deleted file mode 100644 index 12311ed3..00000000 Binary files a/themes/okat_dark/images/fancy_shadow_se.png and /dev/null differ diff --git a/themes/okat_dark/images/fancy_shadow_sw.png b/themes/okat_dark/images/fancy_shadow_sw.png deleted file mode 100644 index 923a8b50..00000000 Binary files a/themes/okat_dark/images/fancy_shadow_sw.png and /dev/null differ diff --git a/themes/okat_dark/images/fancy_shadow_w.png b/themes/okat_dark/images/fancy_shadow_w.png deleted file mode 100644 index 6f808d3e..00000000 Binary files a/themes/okat_dark/images/fancy_shadow_w.png and /dev/null differ diff --git a/themes/okat_dark/images/fancy_title_left.png b/themes/okat_dark/images/fancy_title_left.png deleted file mode 100644 index 1e82b6da..00000000 Binary files a/themes/okat_dark/images/fancy_title_left.png and /dev/null differ diff --git a/themes/okat_dark/images/fancy_title_main.png b/themes/okat_dark/images/fancy_title_main.png deleted file mode 100644 index 5f505b00..00000000 Binary files a/themes/okat_dark/images/fancy_title_main.png and /dev/null differ diff --git a/themes/okat_dark/images/fancy_title_right.png b/themes/okat_dark/images/fancy_title_right.png deleted file mode 100644 index ef0dc201..00000000 Binary files a/themes/okat_dark/images/fancy_title_right.png and /dev/null differ diff --git a/themes/okat_dark/images/ico-album.png b/themes/okat_dark/images/ico-album.png deleted file mode 100644 index 052b3363..00000000 Binary files a/themes/okat_dark/images/ico-album.png and /dev/null differ diff --git a/themes/okat_dark/images/ico-help.png b/themes/okat_dark/images/ico-help.png deleted file mode 100644 index 5c870176..00000000 Binary files a/themes/okat_dark/images/ico-help.png and /dev/null differ diff --git a/themes/okat_dark/images/ico-print.png b/themes/okat_dark/images/ico-print.png deleted file mode 100644 index a350d187..00000000 Binary files a/themes/okat_dark/images/ico-print.png and /dev/null differ diff --git a/themes/okat_dark/images/ico-view-comments.png b/themes/okat_dark/images/ico-view-comments.png deleted file mode 100644 index e5d3630f..00000000 Binary files a/themes/okat_dark/images/ico-view-comments.png and /dev/null differ diff --git a/themes/okat_dark/images/ico-view-fullsize.png b/themes/okat_dark/images/ico-view-fullsize.png deleted file mode 100644 index 0be23e9b..00000000 Binary files a/themes/okat_dark/images/ico-view-fullsize.png and /dev/null differ diff --git a/themes/okat_dark/images/ico-view-slideshow.png b/themes/okat_dark/images/ico-view-slideshow.png deleted file mode 100644 index 82f61f63..00000000 Binary files a/themes/okat_dark/images/ico-view-slideshow.png and /dev/null differ diff --git a/themes/okat_dark/images/map.png b/themes/okat_dark/images/map.png deleted file mode 100644 index 1df93fb5..00000000 Binary files a/themes/okat_dark/images/map.png and /dev/null differ diff --git a/themes/okat_dark/js/jquery.easing.js b/themes/okat_dark/js/jquery.easing.js deleted file mode 100644 index ef743210..00000000 --- a/themes/okat_dark/js/jquery.easing.js +++ /dev/null @@ -1,205 +0,0 @@ -/* - * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/ - * - * Uses the built in easing capabilities added In jQuery 1.1 - * to offer multiple easing options - * - * TERMS OF USE - jQuery Easing - * - * Open source under the BSD License. - * - * Copyright © 2008 George McGinley Smith - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * Neither the name of the author nor the names of contributors may be used to endorse - * or promote products derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * -*/ - -// t: current time, b: begInnIng value, c: change In value, d: duration -jQuery.easing['jswing'] = jQuery.easing['swing']; - -jQuery.extend( jQuery.easing, -{ - def: 'easeOutQuad', - swing: function (x, t, b, c, d) { - //alert(jQuery.easing.default); - return jQuery.easing[jQuery.easing.def](x, t, b, c, d); - }, - easeInQuad: function (x, t, b, c, d) { - return c*(t/=d)*t + b; - }, - easeOutQuad: function (x, t, b, c, d) { - return -c *(t/=d)*(t-2) + b; - }, - easeInOutQuad: function (x, t, b, c, d) { - if ((t/=d/2) < 1) return c/2*t*t + b; - return -c/2 * ((--t)*(t-2) - 1) + b; - }, - easeInCubic: function (x, t, b, c, d) { - return c*(t/=d)*t*t + b; - }, - easeOutCubic: function (x, t, b, c, d) { - return c*((t=t/d-1)*t*t + 1) + b; - }, - easeInOutCubic: function (x, t, b, c, d) { - if ((t/=d/2) < 1) return c/2*t*t*t + b; - return c/2*((t-=2)*t*t + 2) + b; - }, - easeInQuart: function (x, t, b, c, d) { - return c*(t/=d)*t*t*t + b; - }, - easeOutQuart: function (x, t, b, c, d) { - return -c * ((t=t/d-1)*t*t*t - 1) + b; - }, - easeInOutQuart: function (x, t, b, c, d) { - if ((t/=d/2) < 1) return c/2*t*t*t*t + b; - return -c/2 * ((t-=2)*t*t*t - 2) + b; - }, - easeInQuint: function (x, t, b, c, d) { - return c*(t/=d)*t*t*t*t + b; - }, - easeOutQuint: function (x, t, b, c, d) { - return c*((t=t/d-1)*t*t*t*t + 1) + b; - }, - easeInOutQuint: function (x, t, b, c, d) { - if ((t/=d/2) < 1) return c/2*t*t*t*t*t + b; - return c/2*((t-=2)*t*t*t*t + 2) + b; - }, - easeInSine: function (x, t, b, c, d) { - return -c * Math.cos(t/d * (Math.PI/2)) + c + b; - }, - easeOutSine: function (x, t, b, c, d) { - return c * Math.sin(t/d * (Math.PI/2)) + b; - }, - easeInOutSine: function (x, t, b, c, d) { - return -c/2 * (Math.cos(Math.PI*t/d) - 1) + b; - }, - easeInExpo: function (x, t, b, c, d) { - return (t==0) ? b : c * Math.pow(2, 10 * (t/d - 1)) + b; - }, - easeOutExpo: function (x, t, b, c, d) { - return (t==d) ? b+c : c * (-Math.pow(2, -10 * t/d) + 1) + b; - }, - easeInOutExpo: function (x, t, b, c, d) { - if (t==0) return b; - if (t==d) return b+c; - if ((t/=d/2) < 1) return c/2 * Math.pow(2, 10 * (t - 1)) + b; - return c/2 * (-Math.pow(2, -10 * --t) + 2) + b; - }, - easeInCirc: function (x, t, b, c, d) { - return -c * (Math.sqrt(1 - (t/=d)*t) - 1) + b; - }, - easeOutCirc: function (x, t, b, c, d) { - return c * Math.sqrt(1 - (t=t/d-1)*t) + b; - }, - easeInOutCirc: function (x, t, b, c, d) { - if ((t/=d/2) < 1) return -c/2 * (Math.sqrt(1 - t*t) - 1) + b; - return c/2 * (Math.sqrt(1 - (t-=2)*t) + 1) + b; - }, - easeInElastic: function (x, t, b, c, d) { - var s=1.70158;var p=0;var a=c; - if (t==0) return b; if ((t/=d)==1) return b+c; if (!p) p=d*.3; - if (a < Math.abs(c)) { a=c; var s=p/4; } - else var s = p/(2*Math.PI) * Math.asin (c/a); - return -(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b; - }, - easeOutElastic: function (x, t, b, c, d) { - var s=1.70158;var p=0;var a=c; - if (t==0) return b; if ((t/=d)==1) return b+c; if (!p) p=d*.3; - if (a < Math.abs(c)) { a=c; var s=p/4; } - else var s = p/(2*Math.PI) * Math.asin (c/a); - return a*Math.pow(2,-10*t) * Math.sin( (t*d-s)*(2*Math.PI)/p ) + c + b; - }, - easeInOutElastic: function (x, t, b, c, d) { - var s=1.70158;var p=0;var a=c; - if (t==0) return b; if ((t/=d/2)==2) return b+c; if (!p) p=d*(.3*1.5); - if (a < Math.abs(c)) { a=c; var s=p/4; } - else var s = p/(2*Math.PI) * Math.asin (c/a); - if (t < 1) return -.5*(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b; - return a*Math.pow(2,-10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )*.5 + c + b; - }, - easeInBack: function (x, t, b, c, d, s) { - if (s == undefined) s = 1.70158; - return c*(t/=d)*t*((s+1)*t - s) + b; - }, - easeOutBack: function (x, t, b, c, d, s) { - if (s == undefined) s = 1.70158; - return c*((t=t/d-1)*t*((s+1)*t + s) + 1) + b; - }, - easeInOutBack: function (x, t, b, c, d, s) { - if (s == undefined) s = 1.70158; - if ((t/=d/2) < 1) return c/2*(t*t*(((s*=(1.525))+1)*t - s)) + b; - return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b; - }, - easeInBounce: function (x, t, b, c, d) { - return c - jQuery.easing.easeOutBounce (x, d-t, 0, c, d) + b; - }, - easeOutBounce: function (x, t, b, c, d) { - if ((t/=d) < (1/2.75)) { - return c*(7.5625*t*t) + b; - } else if (t < (2/2.75)) { - return c*(7.5625*(t-=(1.5/2.75))*t + .75) + b; - } else if (t < (2.5/2.75)) { - return c*(7.5625*(t-=(2.25/2.75))*t + .9375) + b; - } else { - return c*(7.5625*(t-=(2.625/2.75))*t + .984375) + b; - } - }, - easeInOutBounce: function (x, t, b, c, d) { - if (t < d/2) return jQuery.easing.easeInBounce (x, t*2, 0, c, d) * .5 + b; - return jQuery.easing.easeOutBounce (x, t*2-d, 0, c, d) * .5 + c*.5 + b; - } -}); - -/* - * - * TERMS OF USE - EASING EQUATIONS - * - * Open source under the BSD License. - * - * Copyright © 2001 Robert Penner - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * Neither the name of the author nor the names of contributors may be used to endorse - * or promote products derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ \ No newline at end of file diff --git a/themes/okat_dark/js/jquery.fancybox.js b/themes/okat_dark/js/jquery.fancybox.js deleted file mode 100644 index a07c9cba..00000000 --- a/themes/okat_dark/js/jquery.fancybox.js +++ /dev/null @@ -1,1123 +0,0 @@ -/* - * FancyBox - simple and fancy jQuery plugin - * Examples and documentation at: http://fancy.klade.lv/ - * Version: 1.2.1 (13/03/2009) - * Copyright (c) 2009 Janis Skarnelis - * Licensed under the MIT License: http://en.wikipedia.org/wiki/MIT_License - * Requires: jQuery v1.3+ -*/ -;(function($) { - - $.fn.fixPNG = function() { - return this.each(function () { - var image = $(this).css('backgroundImage'); - - if (image.match(/^url\(["']?(.*\.png)["']?\)$/i)) { - image = RegExp.$1; - $(this).css({ - 'backgroundImage': 'none', - 'filter': "progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true, sizingMethod=" + ($(this).css('backgroundRepeat') == 'no-repeat' ? 'crop' : 'scale') + ", src='" + image + "')" - }).each(function () { - var position = $(this).css('position'); - if (position != 'absolute' && position != 'relative') - $(this).css('position', 'relative'); - }); - } - }); - }; - - - var elem, opts, busy = false, imagePreloader = new Image, loadingTimer, loadingFrame = 1, imageRegExp = /\.(jpg|gif|png|bmp|jpeg)(.*)?$/i; - var isIE = ($.browser.msie && parseInt($.browser.version.substr(0,1)) < 8); - - $.fn.fancybox = function(settings) { - settings = $.extend({}, $.fn.fancybox.defaults, settings); - - var matchedGroup = this; - - function _initialize() { - elem = this; - opts = settings; - - _start(); - - return false; - }; - - function _start() { - if (busy) return; - - if ($.isFunction(opts.callbackOnStart)) { - opts.callbackOnStart(); - } - - opts.itemArray = []; - opts.itemCurrent = 0; - - if (settings.itemArray.length > 0) { - opts.itemArray = settings.itemArray; - - } else { - var item = {}; - - if (!elem.rel || elem.rel == '') { - var item = {href: elem.href, title: elem.title, modules: elem.name, fancyclass: elem.className}; - - if ($(elem).children("img:first").length) { - item.orig = $(elem).children("img:first"); - } - - opts.itemArray.push( item ); - - } else { - - var subGroup = $(matchedGroup).filter("a[rel=" + elem.rel + "]"); - - var item = {}; - - for (var i = 0; i < subGroup.length; i++) { - item = {href: subGroup[i].href, title: subGroup[i].title, modules: subGroup[i].name, fancyclass: subGroup[i].className}; - - if ($(subGroup[i]).children("img:first").length) { - item.orig = $(subGroup[i]).children("img:first"); - } - - opts.itemArray.push( item ); - } - - while ( opts.itemArray[ opts.itemCurrent ].href != elem.href ) { - opts.itemCurrent++; - } - } - } - - if (opts.overlayShow) { - if (isIE) { - $('embed, object, select').css('visibility', 'hidden'); - } - - $("#fancy_overlay").css('opacity', opts.overlayOpacity).show(); - } - - _change_item(); - }; - - function _change_item() { - $("#fancy_right, #fancy_left, #fancy_close, #fancy_title, #fancy_modules").hide(); - - var href = opts.itemArray[ opts.itemCurrent ].href; - - if (href.match(/#/)) { - var target = window.location.href.split('#')[0]; target = href.replace(target, ''); target = target.substr(target.indexOf('#')); - - _set_content('
    ' + $(target).html() + '
    ', opts.frameWidth, opts.frameHeight); - - } else if (href.match(imageRegExp)) { - imagePreloader = new Image; imagePreloader.src = href; - - if (imagePreloader.complete) { - _proceed_image(); - - } else { - $.fn.fancybox.showLoading(); - - $(imagePreloader).unbind().bind('load', function() { - $(".fancy_loading").hide(); - - _proceed_image(); - }); - } - } else if (href.match("iframe") || opts.itemArray[opts.itemCurrent].fancyclass.indexOf("iframe") >= 0) { - if (href.match('w=') && href.match('h=')){ - var ifrWidth = parseInt(href.substring(href.indexOf('w=')+2,href.indexOf('xewx'))); - var ifrHeight = parseInt(href.substring(href.indexOf('h=')+2,href.indexOf('xehx'))); - }else{ - var ifrWidth= opts.frameWidth; - var ifrHeight= opts.frameHeight; - } - $("#fancy_content").empty(); - _set_content('', ifrWidth, ifrHeight); - - } else { - $.get(href, function(data) { - _set_content( '
    ' + data + '
    ', opts.frameWidth, opts.frameHeight ); - }); - } - }; - - function _proceed_image() { - if (opts.imageScale) { - var w = $.fn.fancybox.getViewport(); - - var r = Math.min(Math.min(w[0] - 36, imagePreloader.width) / imagePreloader.width, Math.min(w[1] - 60, imagePreloader.height) / imagePreloader.height); - - var width = Math.round(r * imagePreloader.width); - var height = Math.round(r * imagePreloader.height); - - } else { - var width = imagePreloader.width; - var height = imagePreloader.height; - } - - _set_content('', width, height); - }; - - function _preload_neighbor_images() { - if ((opts.itemArray.length -1) > opts.itemCurrent) { - var href = opts.itemArray[opts.itemCurrent + 1].href; - $("'); - $("#fancy_close, .fancy_bg, .fancy_title, .fancy_modules, .fancy_ico").fixPNG(); - } - }; - - $.fn.fancybox.defaults = { - padding : 10, - imageScale : true, - zoomOpacity : false, - zoomSpeedIn : 0, - zoomSpeedOut : 0, - zoomSpeedChange : 300, - easingIn : 'swing', - easingOut : 'swing', - easingChange : 'swing', - frameWidth : 425, - frameHeight : 355, - overlayShow : true, - overlayOpacity : 0.8, - hideOnContentClick : false, - centerOnScroll : true, - itemArray : [], - callbackOnStart : null, - callbackOnShow : null, - callbackOnClose : null - }; - - $(document).ready(function() { - $.fn.fancybox.build(); - }); - -// ************************************************************************************************************************************* -// ************************************************************************************************************************************* -// ************************************************************************************************************************************* -// ************************************************************************************************************************************* -// ************************************************************************************************************************************* -// ************************************************************************************************************************************* -// ************************************************************************************************************************************* -// ************************************************************************************************************************************* -// ************************************************************************************************************************************* -// ************************************************************************************************************************************* - - var modelem, modopts, modbusy = false, imagePreloader = new Image, loadingTimer, loadingFrame = 1, imageRegExp = /\.(jpg|gif|png|bmp|jpeg)(.*)?$/i; - - $.fn.modbox = function(settings) { - settings = $.extend({}, $.fn.modbox.defaults, settings); - - var matchedGroup = this; - - function _initialize() { - modelem = this; - modopts = settings; - - _start(); - - return false; - }; - - function _start() { - if (modbusy) return; - - if ($.isFunction(modopts.callbackOnStart)) { - modopts.callbackOnStart(); - } - - modopts.itemArray = []; - modopts.itemCurrent = 0; - - if (settings.itemArray.length > 0) { - modopts.itemArray = settings.itemArray; - - } else { - var item = {}; - - if (!modelem.rel || modelem.rel == '') { - var item = {href: modelem.href, title: modelem.title}; - - if ($(modelem).children("img:first").length) { - item.orig = $(modelem).children("img:first"); - } - - modopts.itemArray.push( item ); - - } else { - - var subGroup = $(matchedGroup).filter("a[rel=" + modelem.rel + "]"); - - var item = {}; - - for (var i = 0; i < subGroup.length; i++) { - item = {href: subGroup[i].href, title: subGroup[i].title}; - - if ($(subGroup[i]).children("img:first").length) { - item.orig = $(subGroup[i]).children("img:first"); - } - - modopts.itemArray.push( item ); - } - - while ( modopts.itemArray[ modopts.itemCurrent ].href != modelem.href ) { - modopts.itemCurrent++; - } - } - } - - if (modopts.overlayShow) { - if (isIE) { - $('embed, object, select').css('visibility', 'hidden'); - } - - $("#mod_overlay").css('opacity', modopts.overlayOpacity).show(); - } - - _change_item(); - }; - - function _change_item() { - $("#mod_right, #mod_left, #mod_close, #mod_title").hide(); - - var href = modopts.itemArray[ modopts.itemCurrent ].href; - - if (href.match(/#/)) { - var target = window.location.href.split('#')[0]; target = href.replace(target, ''); target = target.substr(target.indexOf('#')); - - _set_content('
    ' + $(target).html() + '
    ', modopts.frameWidth, modopts.frameHeight); - - } else if (href.match(imageRegExp)) { - imagePreloader = new Image; imagePreloader.src = href; - - if (imagePreloader.complete) { - _proceed_image(); - - } else { - $.fn.modbox.showLoading(); - - $(imagePreloader).unbind().bind('load', function() { - $(".mod_loading").hide(); - - _proceed_image(); - }); - } - - } else if (href.match("iframe") || modelem.className.indexOf("iframe") >= 0) { - _set_content('', modopts.frameWidth, modopts.frameHeight); - - } else { - $.get(href, function(data) { - _set_content( '
    ' + data + '
    ', modopts.frameWidth, modopts.frameHeight ); - }); - } - }; - - function _proceed_image() { - if (modopts.imageScale) { - var w = $.fn.modbox.getViewport(); - - var r = Math.min(Math.min(w[0] - 36, imagePreloader.width) / imagePreloader.width, Math.min(w[1] - 60, imagePreloader.height) / imagePreloader.height); - - var width = Math.round(r * imagePreloader.width); - var height = Math.round(r * imagePreloader.height); - - } else { - var width = imagePreloader.width; - var height = imagePreloader.height; - } - - _set_content('', width, height); - }; - - function _preload_neighbor_images() { - if ((modopts.itemArray.length -1) > modopts.itemCurrent) { - var href = modopts.itemArray[modopts.itemCurrent + 1].href; - - if (href.match(imageRegExp)) { - objNext = new Image(); - objNext.src = href; - } - } - - if (modopts.itemCurrent > 0) { - var href = modopts.itemArray[modopts.itemCurrent -1].href; - - if (href.match(imageRegExp)) { - objNext = new Image(); - objNext.src = href; - } - } - }; - - function _set_content(value, width, height) { - modbusy = true; - - var pad = modopts.padding; - - if (isIE) { - $("#mod_content")[0].style.removeExpression("height"); - $("#mod_content")[0].style.removeExpression("width"); - } - - if (pad > 0) { - width += pad * 2; - height += pad * 2; - - $("#mod_content").css({ - 'top' : pad + 'px', - 'right' : pad + 'px', - 'bottom' : pad + 'px', - 'left' : pad + 'px', - 'width' : 'auto', - 'height' : 'auto' - }); - - if (isIE) { - $("#mod_content")[0].style.setExpression('height', '(this.parentNode.clientHeight - 20)'); - $("#mod_content")[0].style.setExpression('width', '(this.parentNode.clientWidth - 20)'); - } - - } else { - $("#mod_content").css({ - 'top' : 0, - 'right' : 0, - 'bottom' : 0, - 'left' : 0, - 'width' : '100%', - 'height' : '100%' - }); - } - - if ($("#mod_outer").is(":visible") && width == $("#mod_outer").width() && height == $("#mod_outer").height()) { - $("#mod_content").fadeOut("fast", function() { - $("#mod_content").empty().append($(value)).fadeIn("normal", function() { - _finish(); - }); - }); - - return; - } - - var w = $.fn.modbox.getViewport(); - - var itemLeft = (width + 36) > w[0] ? w[2] : (w[2] + Math.round((w[0] - width - 36) / 2)); - var itemTop = (height + 50) > w[1] ? w[3] : (w[3] + Math.round((w[1] - height - 50) / 2)); - - var itemOpts = { - 'left': itemLeft, - 'top': itemTop, - 'width': width + 'px', - 'height': height + 'px' - }; - - if ($("#mod_outer").is(":visible")) { - $("#mod_content").fadeOut("normal", function() { - $("#mod_content").empty(); - $("#mod_outer").animate(itemOpts, modopts.zoomSpeedChange, modopts.easingChange, function() { - $("#mod_content").append($(value)).fadeIn("normal", function() { - _finish(); - }); - }); - }); - - } else { - - if (modopts.zoomSpeedIn > 0 && modopts.itemArray[modopts.itemCurrent].orig !== undefined) { - $("#mod_content").empty().append($(value)); - - var orig_item = modopts.itemArray[modopts.itemCurrent].orig; - var orig_pos = $.fn.modbox.getPosition(orig_item); - - $("#mod_outer").css({ - 'left': (orig_pos.left - 18) + 'px', - 'top': (orig_pos.top - 18) + 'px', - 'width': $(orig_item).width(), - 'height': $(orig_item).height() - }); - - if (modopts.zoomOpacity) { - itemOpts.opacity = 'show'; - } - - $("#mod_outer").animate(itemOpts, modopts.zoomSpeedIn, modopts.easingIn, function() { - _finish(); - }); - - } else { - - $("#mod_content").hide().empty().append($(value)).show(); - $("#mod_outer").css(itemOpts).fadeIn("normal", function() { - _finish(); - }); - } - } - }; - - function _set_navigation() { - if (modopts.itemCurrent != 0) { - $("#mod_left, #mod_left_ico").unbind().bind("click", function(e) { - e.stopPropagation(); - - modopts.itemCurrent--; - _change_item(); - - return false; - }); - - $("#mod_left").show(); - } - - if (modopts.itemCurrent != ( modopts.itemArray.length -1)) { - $("#mod_right, #mod_right_ico").unbind().bind("click", function(e) { - e.stopPropagation(); - - modopts.itemCurrent++; - _change_item(); - - return false; - }); - - $("#mod_right").show(); - } - }; - - function _finish() { - _set_navigation(); - - _preload_neighbor_images(); - - $(document).keydown(function(e) { - if (e.keyCode == 27) { - $.fn.modbox.close(); - $(document).unbind("keydown"); - - } else if(e.keyCode == 37 && modopts.itemCurrent != 0) { - modopts.itemCurrent--; - _change_item(); - $(document).unbind("keydown"); - - } else if(e.keyCode == 39 && modopts.itemCurrent != (modopts.itemArray.length - 1)) { - modopts.itemCurrent++; - _change_item(); - $(document).unbind("keydown"); - } - }); - - if (modopts.centerOnScroll) { - $(window).bind("resize scroll", $.fn.modbox.scrollBox); - } else { - $("div#mod_outer").css("position", "absolute"); - } - - if (modopts.hideOnContentClick) { - $("#mod_wrap").click($.fn.modbox.close); - } - - $("#mod_overlay, #mod_close").bind("click", $.fn.modbox.close); - - $("#mod_close").show(); - - if (modopts.itemArray[ modopts.itemCurrent ].title !== undefined && modopts.itemArray[ modopts.itemCurrent ].title.length > 0) { - $('#mod_title div').html(modopts.itemArray[ modopts.itemCurrent ].title); - $('#mod_title').show(); - } - - if (modopts.overlayShow && isIE) { - $('embed, object, select', $('#mod_content')).css('visibility', 'visible'); - } - - if ($.isFunction(modopts.callbackOnShow)) { - modopts.callbackOnShow(); - } - - modbusy = false; - }; - - return this.unbind('click').click(_initialize); - }; - - $.fn.modbox.scrollBox = function() { - var pos = $.fn.modbox.getViewport(); - - $("#mod_outer").css('left', (($("#mod_outer").width() + 36) > pos[0] ? pos[2] : pos[2] + Math.round((pos[0] - $("#mod_outer").width() - 36) / 2))); - $("#mod_outer").css('top', (($("#mod_outer").height() + 50) > pos[1] ? pos[3] : pos[3] + Math.round((pos[1] - $("#mod_outer").height() - 50) / 2))); - }; - - $.fn.modbox.getNumeric = function(el, prop) { - return parseInt($.curCSS(el.jquery?el[0]:el,prop,true))||0; - }; - - $.fn.modbox.getPosition = function(el) { - var pos = el.offset(); - - pos.top += $.fn.modbox.getNumeric(el, 'paddingTop'); - pos.top += $.fn.modbox.getNumeric(el, 'borderTopWidth'); - - pos.left += $.fn.modbox.getNumeric(el, 'paddingLeft'); - pos.left += $.fn.modbox.getNumeric(el, 'borderLeftWidth'); - - return pos; - }; - - $.fn.modbox.showIframe = function() { - $(".mod_loading").hide(); - $("#mod_frame").show(); - }; - - $.fn.modbox.getViewport = function() { - return [$(window).width(), $(window).height(), $(document).scrollLeft(), $(document).scrollTop() ]; - }; - - $.fn.modbox.animateLoading = function() { - if (!$("#mod_loading").is(':visible')){ - clearInterval(loadingTimer); - return; - } - - $("#mod_loading > div").css('top', (loadingFrame * -40) + 'px'); - - loadingFrame = (loadingFrame + 1) % 12; - }; - - $.fn.modbox.showLoading = function() { - clearInterval(loadingTimer); - - var pos = $.fn.modbox.getViewport(); - - $("#mod_loading").css({'left': ((pos[0] - 40) / 2 + pos[2]), 'top': ((pos[1] - 40) / 2 + pos[3])}).show(); - $("#mod_loading").bind('click', $.fn.modbox.close); - - loadingTimer = setInterval($.fn.modbox.animateLoading, 66); - }; - - $.fn.modbox.close = function() { - modbusy = true; - - $(imagePreloader).unbind(); - - $("#mod_overlay, #mod_close").unbind(); - - if (modopts.hideOnContentClick) { - $("#mod_wrap").unbind(); - } - - $("#mod_close, .mod_loading, #mod_left, #mod_right, #mod_title").hide(); - - if (modopts.centerOnScroll) { - $(window).unbind("resize scroll"); - } - - __cleanup = function() { - $("#mod_overlay, #mod_outer").hide(); - - if (modopts.centerOnScroll) { - $(window).unbind("resize scroll"); - } - - if (isIE) { - $('embed, object, select').css('visibility', 'visible'); - } - - if ($.isFunction(modopts.callbackOnClose)) { - modopts.callbackOnClose(); - } - - modbusy = false; - }; - - if ($("#mod_outer").is(":visible") !== false) { - if (modopts.zoomSpeedOut > 0 && modopts.itemArray[modopts.itemCurrent].orig !== undefined) { - var orig_item = modopts.itemArray[modopts.itemCurrent].orig; - var orig_pos = $.fn.modbox.getPosition(orig_item); - - var itemOpts = { - 'left': (orig_pos.left - 18) + 'px', - 'top': (orig_pos.top - 18) + 'px', - 'width': $(orig_item).width(), - 'height': $(orig_item).height() - }; - - if (modopts.zoomOpacity) { - itemOpts.opacity = 'hide'; - } - - $("#mod_outer").stop(false, true).animate(itemOpts, modopts.zoomSpeedOut, modopts.easingOut, __cleanup); - - } else { - $("#mod_outer").stop(false, true).fadeOut("fast", __cleanup); - } - - } else { - __cleanup(); - } - - return false; - }; - - $.fn.modbox.build = function() { - var html = ''; - - html += '
    '; - - html += '
    '; - - html += '
    '; - - html += '
    '; - - html += '
    '; - - html += '
    '; - - html += '
    '; - - html += ''; - - html += '
    '; - - html += '
    '; - - html += '
    '; - - html += '
    '; - - html += '
    '; - - $(html).appendTo("body"); - - $('
    ').appendTo('#mod_title'); - - if (isIE) { - $("#mod_inner").prepend(''); - $("#mod_close, .mod_bg, .mod_title, .mod_ico").fixPNG(); - } - }; - - $.fn.modbox.defaults = { - padding : 0, - imageScale : true, - zoomOpacity : false, - zoomSpeedIn : 0, - zoomSpeedOut : 0, - zoomSpeedChange : 300, - easingIn : 'swing', - easingOut : 'swing', - easingChange : 'swing', - frameWidth : 400, - frameHeight : 400, - overlayShow : true, - overlayOpacity : 0.3, - hideOnContentClick : false, - centerOnScroll : true, - itemArray : [], - callbackOnStart : null, - callbackOnShow : null, - callbackOnClose : null - }; - - $(document).ready(function() { - $.fn.modbox.build(); - }); - -})(jQuery); \ No newline at end of file diff --git a/themes/okat_dark/theme.info b/themes/okat_dark/theme.info deleted file mode 100644 index e88154d7..00000000 --- a/themes/okat_dark/theme.info +++ /dev/null @@ -1,6 +0,0 @@ -name = "okat_dark" -description = "Customized 3nids theme based on Lightroom." -version = 1 -author = "Okat" -site = 1 -admin = 0 diff --git a/themes/okat_dark/thumbnail.png b/themes/okat_dark/thumbnail.png deleted file mode 100644 index 3b7bcfec..00000000 Binary files a/themes/okat_dark/thumbnail.png and /dev/null differ diff --git a/themes/okat_dark/views/album.html.php b/themes/okat_dark/views/album.html.php deleted file mode 100644 index ab67f100..00000000 --- a/themes/okat_dark/views/album.html.php +++ /dev/null @@ -1,51 +0,0 @@ - - -
    - album_top() ?> -

    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 ; -?> -
      - - - - - - - $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() ?> - -paginator() ?> diff --git a/themes/okat_dark/views/comments.html.php b/themes/okat_dark/views/comments.html.php deleted file mode 100644 index 01eeadd3..00000000 --- a/themes/okat_dark/views/comments.html.php +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - 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("three_nids.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() ?> - - -
    - thumb_img() ?> -
    - id}") ?>" 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)) ?> -
      -
      • - -
    -
    - - diff --git a/themes/okat_dark/views/dynamic.html.php b/themes/okat_dark/views/dynamic.html.php deleted file mode 100644 index 7c0e7131..00000000 --- a/themes/okat_dark/views/dynamic.html.php +++ /dev/null @@ -1,37 +0,0 @@ - -
    -
    - dynamic_top() ?> -
    -

    -
    -items(); - $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): ?> - - -
    • - thumb_top($child) ?> - - thumb_bottom($child) ?> - context_menu($child, "#g-ItemId-{$child->id} .g-Thumbnail") ?> -
      • - -
    - - - - -dynamic_bottom() ?> - -paginator() ?> diff --git a/themes/okat_dark/views/exif_dialog.html.php b/themes/okat_dark/views/exif_dialog.html.php deleted file mode 100644 index 8ce20cc3..00000000 --- a/themes/okat_dark/views/exif_dialog.html.php +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - -
    -
    - - - - - - - - - - - - - - - -
    - - - - - - - -
    -
    -
    - - diff --git a/themes/okat_dark/views/image_block_block.html.php b/themes/okat_dark/views/image_block_block.html.php deleted file mode 100644 index 0b56af20..00000000 --- a/themes/okat_dark/views/image_block_block.html.php +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/themes/okat_dark/views/movie.html.php b/themes/okat_dark/views/movie.html.php deleted file mode 100644 index 3ebe0632..00000000 --- a/themes/okat_dark/views/movie.html.php +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - 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("three_nids.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") ?> - script("flowplayer.js") ?> - head() ?> - - -
    -
    - movie_img( - array("class" => "g-movie", "id" => "g-movie-id-{$item->id}", - "style" => "display:block;width:{$item->width}px;height:{$item->height}px")) ?> - context_menu($item, "#g-movie-id-{$item->id}") ?> -
    -

    title) ?>

    -
    description)) ?>
    -
    -
    - - diff --git a/themes/okat_dark/views/no_sidebar.html.php b/themes/okat_dark/views/no_sidebar.html.php deleted file mode 100644 index 378bd971..00000000 --- a/themes/okat_dark/views/no_sidebar.html.php +++ /dev/null @@ -1,6 +0,0 @@ - -
      -
    • - Add blocks", - array("url" => html::mark_clean(url::site("admin/sidebar")))) ?>
      • -
    diff --git a/themes/okat_dark/views/photo.html.php b/themes/okat_dark/views/photo.html.php deleted file mode 100644 index 80a499b6..00000000 --- a/themes/okat_dark/views/photo.html.php +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - 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("three_nids.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}") ?> -
    - - diff --git a/themes/okat_dark/views/search.html.php b/themes/okat_dark/views/search.html.php deleted file mode 100644 index 0699decd..00000000 --- a/themes/okat_dark/views/search.html.php +++ /dev/null @@ -1,39 +0,0 @@ - - - -pagination = new Pagination(); - $theme->pagination->initialize(array("query_string" => "page","total_items" => $children_count_true,"items_per_page" => $page_size,"style" => "classic")); - $children_offset = ($theme->pagination->current_page -1) * $page_size ; ?> - -
    -

    %term", array("term" => $q)) ?>

    - - -
      - - - - - -
    • - thumb_top($child) ?> - - thumb_bottom($child) ?> - context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?> -
      • - - - - - -
    - paginator() ?> - - -

    - %term", array("term" => $q)) ?> -

    - - -
    diff --git a/themes/okat_dark/views/sidebar.html.php b/themes/okat_dark/views/sidebar.html.php deleted file mode 100644 index 54f1d00d..00000000 --- a/themes/okat_dark/views/sidebar.html.php +++ /dev/null @@ -1,18 +0,0 @@ - -sidebar_top() ?> -
    -
    - - album_menu() ?> - - photo_menu() ?> - - movie_menu() ?> - - tag_menu() ?> - -
    -
    - -sidebar_blocks() ?> -sidebar_bottom() ?> diff --git a/themes/sobriety/css/screen.css b/themes/sobriety/css/screen.css new file mode 100644 index 00000000..bd264cc9 --- /dev/null +++ b/themes/sobriety/css/screen.css @@ -0,0 +1,940 @@ +/* Common +----------------------------------------------- */ +a, a:visited { + + color: #258; + text-decoration: none; + + border-bottom: 1px dotted #469; +} + +a:hover, a:active { + color: #933; + + border-color: #b55; + border-bottom-style: solid; +} + +h1 { + padding: 0 0 .5em; + + font-size: 1.7em; + font-weight: normal; + color: #543; + + border-bottom: 1px solid #ddd; +} + + + +/* Page structure +----------------------------------------------- */ + +body { + margin: 0; + + font-family: "Gill Sans", "Trebuchet MS", Verdana, sans-serif; + font-size: small; + color: #333; + + background-color: #ccb; + background-image: url("../images/backgrounds/body-bg.jpg"); + background-repeat: repeat-x; + background-position: top; +} + + +/* ~~~~~ Header ~~~~~ */ + +div#g-header { + padding: 0.5em 0; + height: 1.5em; + + line-height: 1.5em; + + background-color: #000; + background-image: url("../images/backgrounds/body-breadcrumbs-bg.gif"); + background-repeat: repeat; + background-position: top; + + border-bottom: 3px solid #bba; +} + +div#g-banner { + display: none; +} + +ul.g-breadcrumbs { + margin: 0; + padding: 0; + + color: #777; + text-align: center; +} + +ul.g-breadcrumbs > li { + display: inline; + padding-left: 0.3em; +} + +ul.g-breadcrumbs > li:after { + content: "»"; +} + +ul.g-breadcrumbs > li.g-active:after { + content: ""; +} + +ul.g-breadcrumbs > li > a { + margin-right: 0.3em; + + color: #888; + + border-color: #777; +} + + +/* ~~~~~ Content ~~~~~ */ + +div#bd { + padding: 15px; +} + + +/* ~~~~~ Footer ~~~~~ */ +/* TODO */ +#g-footer { + clear: both; + margin: 0 15px; + border-top: 1px solid #ddc; + color: #887; + padding: .5em 0 2em 0; + text-align: center; +} + +#g-footer #g-credits { + list-style: none; + display: inline; + margin: 0 auto; + padding: 0; +} + +#g-footer #g-credits li { + display: inline; +} + + + + + + +/* Albums & Items +----------------------------------------------- */ + + +.g-item, +#g-item .g-paginator li.g-first, +#g-item .g-paginator li.g-text-right { + display: block; + position: relative; + text-align: center; + + background: #fff url("../images/backgrounds/thumb.png") no-repeat; + + border-radius: 5px; + box-shadow: 3px 3px 0px #b7b7a7; + -webkit-border-radius: 5px; + -webkit-box-shadow: 3px 3px 0px #b7b7a7; + -moz-border-radius: 5px; + -moz-box-shadow: 3px 3px 0px #b7b7a7; +} + + + +.g-item > a, +#g-item .g-paginator li.g-first a, +#g-item .g-paginator li.g-text-right a { + display: block; + width: 100%; + height: 100%; + text-decoration: none; + background-position: center; + background-repeat: no-repeat; + border: 0; + vertical-align: middle; +} + +.g-item > a { + display: table-cell; +} + +#g-item .g-paginator li.g-first a, +#g-item .g-paginator li.g-text-right a { + border-bottom: none; + text-indent: -9999em; + font-size: 1px; + color: #fff; +} + +.g-item > h2 { + position: absolute; + left: 15px; + bottom: 8px; + margin: 0; + padding-top: 8px; + + background: #fff; + text-align: center; + color:#333; + line-height: 10px; + + font-size: 10px; + font-weight: normal; + text-transform: uppercase; + letter-spacing: .1em; +} + +.g-item > h2 a { + border: 0; +} + +#g-item .g-paginator li.g-text-right { + position: absolute; + top: 0px; +} + + + + +/* ~~~~~ Album ~~~~~ */ +.g-item { + float:left; + margin:0 10px 10px 0; +} + +.g-item.g-album > a { + background-image: url("../images/emblems/g-item_g-album.png"); + background-repeat: no-repeat; +} + + + + + +#g-content > #g-info { + clear:left; + float:left; + width:22%; + margin:0; + line-height:1.4em; +} +#g-content > #g-info h1 { + margin:0 0 .5em; + text-align:left; + text-transform:none; + letter-spacing:0; + } +#g-content > #g-info .g-description { + line-height:1.6em; + margin-bottom:1em; + } + + +#g-content > #g-album-grid { + float:right; + position:relative; + width:75%; + margin:0 0 15px; + padding:0; + list-style:none; + line-height:1.4em; + } +#g-content > #g-album-grid li.g-item { + } + +/*.g-item .g-context-menu,*/ +.g-item .g-metadata +{ + display: none; +} + + +.g-item > ul.g-context-menu { + list-style-type: none; + + display: none; + position: absolute; + top: 0px; + left: 0px; + + font-size: 12px; + + width: 32px; + height: 32px; + padding: 2px; + margin: 0; +} + +.g-item:hover > ul.g-context-menu { + display: block; +} + +.g-item:hover > ul.g-context-menu > li { + + display: block; + width: 32px; + height: 32px; + background: url('../images/emblems/g-context-menu.png') no-repeat; +} + +.g-item:hover > ul.g-context-menu > li:hover { + background: none; +} + +.g-item:hover > ul.g-context-menu > li > a { + display: none; +} + +.g-item:hover > ul.g-context-menu > li > ul { + list-style-type: none; + background: url('../images/backgrounds/000000_opacity50.png') 0 0 repeat; + padding: 5px 2px ; + display: none; + position: absolute; + top: 0; + left: 0; + width: 230px; + text-align: left; + -moz-border-radius-topleft: 5px; + -moz-border-radius-topright: 5px; + -webkit-border-top-left-radius: 5px; + -webkit-border-top-right-radius: 5px; + z-index: 2; +} + +.g-item:hover > ul.g-context-menu > li:hover > ul { + display: block; +} +.g-item:hover > ul.g-context-menu > li:hover > ul > li { + line-height: 16px; + padding: 0px 0 0px 20px; +} +.g-item:hover > ul.g-context-menu > li:hover > ul > li > a { + color: #fff; + text-decoration: none; + border: none; + display: block; + padding: 4px 0; +} + +.g-item:hover > ul.g-context-menu > li:hover > ul > li > a > span { + height: 16px; + width: 16px; + display: block; + position: absolute; + left: 2px; + background-image: url("../images/icons/ui-icons_d8e7f3_256x240.png"); +} +.g-item:hover > ul.g-context-menu > li:hover > ul > li:hover > a { + color: #f9bd01; +} +.g-item:hover > ul.g-context-menu > li:hover > ul > li:hover > a > span { + background-image: url("../images/icons/ui-icons_f9bd01_256x240.png"); +} + +span.ui-icon-pencil { background-position: -64px -112px; } +span.ui-icon-folder-open { background-position: -16px -96px; } +span.ui-icon-star { background-position: -224px -112px; } +span.ui-icon-trash { background-position: -176px -96px; } +span.ui-icon-rotate-ccw { background-position: -192px -64px; } +span.ui-icon-rotate-cw { background-position: -208px -64px; } +span.ui-icon-plus { background-position: -16px -128px; } +span.ui-icon-note { background-position: -64px -96px; } +span.ui-icon-key { background-position: -112px -128px; } + + + + + + + +#g-content > .g-paginator { + clear:left; + float:left; + width:22%; + position: relative; + padding: 2em 0 0 0; + margin: 0; +} + +#g-content > .g-paginator li { + padding: 0; + margin: 0; + list-style: none; +} + +#g-content > .g-paginator .g-info { + position: absolute; + top: 0; + width: 100%; + background:#bba; + text-align: center; + padding:2px 0; + margin:0 0 .5em; +} + +#g-content > .g-paginator .g-first, +#g-content > .g-paginator .g-text-right { + width: 45%; + float: left; +} +#g-content > .g-paginator .g-text-right { + float: right; + text-align: right; +} + +#g-content > .g-paginator .g-first a + a:before { + content: "« "; +} + +#g-content > .g-paginator .g-text-right a:first-child:after { + content: " »"; +} + +#g-content > .g-paginator .g-first a:first-child, +#g-content > .g-paginator .g-text-right a + a, +#g-content > .g-paginator .ui-state-disabled { + display: none; +} + +#g-sidebar { + clear:left; + float:left; + width:22%; +} + +#g-sidebar .g-block { + margin-top: 1em; +} + +#g-sidebar .g-block h2 { + width: 100%; + background:#bba; + text-align: center; + padding:2px 0; + margin:0 0 .5em; + font-size: 1em; + font-weight: normal; +} + + +/* ~~~~~ Item ~~~~~ */ + +#g-item { + position: relative; +} + +#g-item #g-photo, +#g-item #g-movie { + text-align: center; + display: inline; + position: relative; + left: 50%; + background: #b7b7a7; +} + +#g-item #g-movie { + display: block; +} + +#g-item #g-photo a { + border: none; +} + +#g-item #g-photo a img { + border: 10px solid #fff; + -webkit-box-shadow: 3px 3px 0px #b7b7a7; + -moz-box-shadow: 3px 3px 0px #b7b7a7; +} + +#g-item .g-paginator { + position: absolute; + left: 50%; + width: 0px; + height: 0px; + + list-style: none; + padding: 0; + margin: 0; +} + +#g-item .g-paginator li { + padding: 0; + margin: 0; + display: inline; +} + +#g-item .g-paginator li.g-info { + display: block; + position: absolute; + right: 340px; /* 640/2 + 10 + 10 */ + top: 230px; + width: 230px; + height: 30px; + padding-top: 10px; + margin-top: 30px; + text-align: right; + font-style: italic; + background-image: url("../images/divider_l.png"); + background-position: right top; + background-repeat: no-repeat; +} + +#g-item .g-paginator li.g-first a:hover span, +#g-item .g-paginator li.g-text-right a:hover span { + display: block; + position: relative; + height: 22px; + top: 10px; + background-position: center; + background-repeat: no-repeat; + z-index: 2; +} +#g-item .g-paginator li.g-first a:hover span { + background-image: url("../images/photonav_prev.png"); +} + +#g-item .g-paginator li.g-text-right a:hover span { + background-image: url("../images/photonav_next.png"); +} + +#g-item .g-context-menu { + display: none; +} + +#g-item #g-info { + width: 230px; + position: absolute; + top: 260px; /* (230 + 30) */ + left: 50%; + margin-left: 340px; /* (640/2 + 10 + 10) */ +} + +#g-item #g-info h1 { + text-align: left; + font-size: 1em; + border: none; + padding-top: 10px; + background-image: url("../images/divider_r.png"); + background-position: left top; + background-repeat: no-repeat; +} + +#g-item .g-block { + display: none; +} + +#g-item .g-block#g-metadata { + text-align: right; + display: block; + width: 300px; /* 230px is not enought: french is verbose */ + position: absolute; + right: 50%; + margin-right: 340px; /* (640/2 + 10 + 10) */ + top: 300px; /* (230 + 30 + 10 + 30) */ +} + +#g-item .g-block#g-metadata h2 { + font-size: 1em; + padding-top: 10px; + text-align: right; + font-style: italic; + background-image: url("../images/divider_l.png"); + background-position: right top; + background-repeat: no-repeat; +} + +#g-item .g-block#g-metadata ul { + list-style: none; + padding: 0; +} + +#g-item .g-block#g-comments { + display: block; +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#g-login-menu { + position: absolute; + right: 0; + padding: 0; + margin: 0; +} +#g-login-menu li { + display: inline; +} +#g-login-menu li:first-child { + /*display: none;*/ +} +#g-logo, #g-quick-search-form, #g-site-menu { + display: none; +} + + + + + + + + + +/* Status and validation messages ~~~~ */ + +.g-message-block { + background-position: .4em .3em; + border: 1px solid #ccc; + padding: 0; +} + +#g-action-status { + width: 75%; + float: right; + margin-bottom: 1em; +} + +#g-action-status li, +p#g-action-status, +div#g-action-status { + padding: .3em .3em .3em 30px; +} + +#g-site-status li { + border-bottom: 1px solid #ccc; + padding: .3em .3em .3em 30px; +} + +.g-module-status { + clear: both; + margin-bottom: 1em; +} + +.g-message { + background-position: 0 50%; +} + +.g-warning { + background: #fcf9ce url('../../../lib/images/ico-warning.png') no-repeat .4em 50%; +} + + + + + +/* ~~~~~ Dialog ~~~~~ */ + +.ui-widget-overlay { + background: #000; + opacity: .8; + position: fixed; + top: 0; + bottom: 0; + left: 0; + right: 0; +} + +.ui-dialog { + background: url("../images/backgrounds/f0f0f0_opacity80.png"); + position: fixed !important; + padding: 0; +} + +.ui-dialog-titlebar { + display: none; +} + +#g-dialog { + padding: 0 2em 0 15px; + margin: 0; +} + +#g-dialog form, #g-dialog div#g-edit-permissions-form { + padding: 0 0 0 63px; /* 48 + 15 */ + margin: 0; + background-repeat: no-repeat; + background-position: 0px 3em; +} +#g-dialog form#g-add-album-form { + background-image: url("../images/icons/g-add-album-form.png"); +} +#g-dialog form#g-edit-album-form { + background-image: url("../images/icons/g-edit-album-form.png"); +} +#g-dialog form#g-add-photos-form { + background-image: url("../images/icons/g-add-photos-form.png"); +} +#g-dialog form#g-confirm-delete { + background-image: url("../images/icons/g-confirm-delete.png"); +} +#g-dialog div#g-edit-permissions-form { + background-image: url("../images/icons/g-edit-permissions-form.png"); +} + + +#g-dialog form fieldset, +#g-dialog div#g-edit-permissions-form fieldset { + border: none; + padding: 0; + margin: 0; +} + +#g-dialog form fieldset legend, +#g-dialog div#g-edit-permissions-form fieldset legend { + font-size: 1em; + font-weight: bold; + /*text-align: center;*/ + display: block; + padding: 1em 0 1em 0; + /*margin: auto;*/ +} + + +#g-dialog form fieldset ul, +#g-dialog div#g-edit-permissions-form fieldset ul { + list-style: none; + margin: 0; + padding: 0; +} + +#g-dialog form fieldset ul li, +#g-dialog div#g-edit-permissions-form fieldset ul li { + padding-bottom: 0.8em; +} + +/*#g-dialog form fieldset ul li label { + padding-bottom: 0.5em; +}*/ + +#g-dialog input.textbox, +#g-dialog input[type=text], +#g-dialog input[type=password], +#g-dialog textarea { + /*border: 1px solid #000;*/ + width: 100%; + padding: 0; + margin: 0; +} + +#g-dialog textarea { + height: 8em; +} + +#g-add-photos-canvas-sd { + height: 33px; + /*margin-right: 63px;*/ + position: relative; +} + +#g-add-photos-button-sd { + z-index: 1; + display: block; + position: relative; + width: 150px; + height: 20px; + top: 6px; + padding: 0; + margin: auto; +} + +#g-add-photos-canvas-sd object { + margin: 0; + z-index: 100; + position: relative; + display: block; + margin: auto; + top: -20px; + /*top: 0; + left: 50%; + padding-right: 75px;*/ + /*position: relative;display: none;*/ +} + +.uploadifyQueue { + display: none; +} + +#g-add-photos-progress { + margin-top: 1em; +} + +#g-add-photos-progress li { + padding: 0; +} + +#g-add-photos-progress-text { + font-size: 1.2em; +} + +#g-add-photos-progressbar-frame { + width: 100%; + padding: 0 !important; + border: 1px solid #aaa; +} + +#g-add-photos-progressbar { + display: block; + height: 22px; + width: 0%; + background-image: url("../images/backgrounds/pbar-ani.gif"); + background-repeat: x-repeat; +} +#g-add-photos-progressbar.stop { + background-image: url("../images/backgrounds/pbar-ani-stop.gif"); +} + +#g-dialog div#g-edit-permissions-form table { + width: 100%; + border: none; + padding: 0; + margin: 0; + border-spacing: 0px; + border-collapse: collapse; +} +#g-dialog div#g-edit-permissions-form table a { + border: none; +} +#g-dialog div#g-edit-permissions-form tbody tr { + border-bottom: 1px solid #aaa; +} +#g-dialog div#g-edit-permissions-form thead th { + font-weight: normal; +} +#g-dialog div#g-edit-permissions-form tbody th { + text-align: left; +} +#g-dialog div#g-edit-permissions-form td { + width: 65px; +} + +/*#g-dialog input[type=submit].submit { + float: right; +} +#g-dialog a.g-cancel { + float: left; + clear: left; +}*/ + +/* Forms in dialogs and panels ~~~~~~~~~ */ + +/*#g-dialog ul li { + padding-bottom: .8em; +} + + + +input[readonly] { + background-color: #F4F4FC; +} + +#g-dialog input.textbox, +#g-dialog input[type=text], +#g-dialog input[type=password], +#g-dialog textarea { + width: 97%; +}*/ + +/* Short forms ~~~~~~~~~~~~~~~~~~~~~~~ */ + +/*.g-short-form legend, +.g-short-form label { + display: none; +} + +.g-short-form fieldset { + border: none; + padding: 0; +} + +.g-short-form li { + float: left; + margin: 0 !important; + padding: .4em 0; +} + +.g-short-form .textbox, +.g-short-form input[type=text] { + color: #666; + padding: .3em .6em; + width: 100%; +} + +.g-short-form .textbox.g-error { + border: 1px solid #f00; + color: #f00; + padding-left: 24px; +} + +.g-short-form .g-cancel { + display: block; + margin: .3em .8em; +} + +#g-sidebar .g-short-form li { + padding-left: 0; + padding-right: 0; +}*/ + +/* Dialogs and panels ~~~~~~~~~~~~~~~~~~ */ + +/*#g-dialog { + text-align: left; +} + + + +#g-dialog .g-cancel { + margin: .4em 1em; +} + +#g-panel { + display: none; + padding: 1em; +}*/ + +/* Inline layout ~~~~~~~~~~ */ + +/*.g-inline li { + float: left; + margin-left: 1.8em; + padding-left: 0 !important; +} + +.g-inline li.g-first { + margin-left: 0; +}*/ + diff --git a/themes/sobriety/images/backgrounds/000000_opacity50.png b/themes/sobriety/images/backgrounds/000000_opacity50.png new file mode 100644 index 00000000..a2321f11 Binary files /dev/null and b/themes/sobriety/images/backgrounds/000000_opacity50.png differ diff --git a/themes/sobriety/images/backgrounds/ajax_progress2.gif b/themes/sobriety/images/backgrounds/ajax_progress2.gif new file mode 100644 index 00000000..658f0a0b Binary files /dev/null and b/themes/sobriety/images/backgrounds/ajax_progress2.gif differ diff --git a/themes/stopdesign/img/bg.jpg b/themes/sobriety/images/backgrounds/body-bg.jpg similarity index 100% rename from themes/stopdesign/img/bg.jpg rename to themes/sobriety/images/backgrounds/body-bg.jpg diff --git a/themes/stopdesign/img/bg_path.gif b/themes/sobriety/images/backgrounds/body-breadcrumbs-bg.gif similarity index 100% rename from themes/stopdesign/img/bg_path.gif rename to themes/sobriety/images/backgrounds/body-breadcrumbs-bg.gif diff --git a/themes/sobriety/images/backgrounds/f0f0f0_opacity80.png b/themes/sobriety/images/backgrounds/f0f0f0_opacity80.png new file mode 100644 index 00000000..3944a9f6 Binary files /dev/null and b/themes/sobriety/images/backgrounds/f0f0f0_opacity80.png differ diff --git a/themes/sobriety/images/backgrounds/pbar-ani-stop.gif b/themes/sobriety/images/backgrounds/pbar-ani-stop.gif new file mode 100644 index 00000000..f083c4da Binary files /dev/null and b/themes/sobriety/images/backgrounds/pbar-ani-stop.gif differ diff --git a/themes/sobriety/images/backgrounds/pbar-ani.gif b/themes/sobriety/images/backgrounds/pbar-ani.gif new file mode 100644 index 00000000..0dfd45b8 Binary files /dev/null and b/themes/sobriety/images/backgrounds/pbar-ani.gif differ diff --git a/themes/sobriety/images/backgrounds/progressbar.png b/themes/sobriety/images/backgrounds/progressbar.png new file mode 100644 index 00000000..e23fe76d Binary files /dev/null and b/themes/sobriety/images/backgrounds/progressbar.png differ diff --git a/themes/sobriety/images/backgrounds/progressbar.tiff b/themes/sobriety/images/backgrounds/progressbar.tiff new file mode 100644 index 00000000..5d12cab3 Binary files /dev/null and b/themes/sobriety/images/backgrounds/progressbar.tiff differ diff --git a/themes/sobriety/images/backgrounds/thumb.png b/themes/sobriety/images/backgrounds/thumb.png new file mode 100644 index 00000000..b44ed363 Binary files /dev/null and b/themes/sobriety/images/backgrounds/thumb.png differ diff --git a/themes/stopdesign/img/bullet_white.gif b/themes/sobriety/images/bullet_white.gif similarity index 100% rename from themes/stopdesign/img/bullet_white.gif rename to themes/sobriety/images/bullet_white.gif diff --git a/themes/stopdesign/img/divider_l.png b/themes/sobriety/images/divider_l.png similarity index 100% rename from themes/stopdesign/img/divider_l.png rename to themes/sobriety/images/divider_l.png diff --git a/themes/stopdesign/img/divider_r.png b/themes/sobriety/images/divider_r.png similarity index 100% rename from themes/stopdesign/img/divider_r.png rename to themes/sobriety/images/divider_r.png diff --git a/themes/sobriety/images/emblems/g-context-menu.png b/themes/sobriety/images/emblems/g-context-menu.png new file mode 100644 index 00000000..fe593fbb Binary files /dev/null and b/themes/sobriety/images/emblems/g-context-menu.png differ diff --git a/themes/sobriety/images/emblems/g-item_g-album.png b/themes/sobriety/images/emblems/g-item_g-album.png new file mode 100644 index 00000000..89a38508 Binary files /dev/null and b/themes/sobriety/images/emblems/g-item_g-album.png differ diff --git a/themes/stopdesign/img/icon_pushpin.gif b/themes/sobriety/images/icon_pushpin.gif similarity index 100% rename from themes/stopdesign/img/icon_pushpin.gif rename to themes/sobriety/images/icon_pushpin.gif diff --git a/themes/sobriety/images/icons/g-add-album-form.png b/themes/sobriety/images/icons/g-add-album-form.png new file mode 100644 index 00000000..ddaf8234 Binary files /dev/null and b/themes/sobriety/images/icons/g-add-album-form.png differ diff --git a/themes/sobriety/images/icons/g-add-photos-form.png b/themes/sobriety/images/icons/g-add-photos-form.png new file mode 100644 index 00000000..4fe3fc3d Binary files /dev/null and b/themes/sobriety/images/icons/g-add-photos-form.png differ diff --git a/themes/sobriety/images/icons/g-confirm-delete.png b/themes/sobriety/images/icons/g-confirm-delete.png new file mode 100644 index 00000000..95a8ea7e Binary files /dev/null and b/themes/sobriety/images/icons/g-confirm-delete.png differ diff --git a/themes/sobriety/images/icons/g-edit-album-form.png b/themes/sobriety/images/icons/g-edit-album-form.png new file mode 100644 index 00000000..73ee06c4 Binary files /dev/null and b/themes/sobriety/images/icons/g-edit-album-form.png differ diff --git a/themes/sobriety/images/icons/g-edit-permissions-form.png b/themes/sobriety/images/icons/g-edit-permissions-form.png new file mode 100644 index 00000000..7579bdd4 Binary files /dev/null and b/themes/sobriety/images/icons/g-edit-permissions-form.png differ diff --git a/themes/sobriety/images/icons/g-edit-permissions-form_.png b/themes/sobriety/images/icons/g-edit-permissions-form_.png new file mode 100644 index 00000000..e37343f5 Binary files /dev/null and b/themes/sobriety/images/icons/g-edit-permissions-form_.png differ diff --git a/themes/sobriety/images/icons/ui-icons_d8e7f3_256x240.png b/themes/sobriety/images/icons/ui-icons_d8e7f3_256x240.png new file mode 100644 index 00000000..9ea51421 Binary files /dev/null and b/themes/sobriety/images/icons/ui-icons_d8e7f3_256x240.png differ diff --git a/themes/sobriety/images/icons/ui-icons_f9bd01_256x240.png b/themes/sobriety/images/icons/ui-icons_f9bd01_256x240.png new file mode 100644 index 00000000..c41adbb2 Binary files /dev/null and b/themes/sobriety/images/icons/ui-icons_f9bd01_256x240.png differ diff --git a/themes/stopdesign/img/moreslide_next.gif b/themes/sobriety/images/moreslide_next.gif similarity index 100% rename from themes/stopdesign/img/moreslide_next.gif rename to themes/sobriety/images/moreslide_next.gif diff --git a/themes/stopdesign/img/moreslide_prev.gif b/themes/sobriety/images/moreslide_prev.gif similarity index 100% rename from themes/stopdesign/img/moreslide_prev.gif rename to themes/sobriety/images/moreslide_prev.gif diff --git a/themes/stopdesign/img/photonav_next.png b/themes/sobriety/images/photonav_next.png similarity index 100% rename from themes/stopdesign/img/photonav_next.png rename to themes/sobriety/images/photonav_next.png diff --git a/themes/stopdesign/img/photonav_prev.png b/themes/sobriety/images/photonav_prev.png similarity index 100% rename from themes/stopdesign/img/photonav_prev.png rename to themes/sobriety/images/photonav_prev.png diff --git a/themes/stopdesign/img/slide_minis.gif b/themes/sobriety/images/slide_minis.gif similarity index 100% rename from themes/stopdesign/img/slide_minis.gif rename to themes/sobriety/images/slide_minis.gif diff --git a/themes/sobriety/js/sobriety.ui.init.js b/themes/sobriety/js/sobriety.ui.init.js new file mode 100644 index 00000000..4e97611f --- /dev/null +++ b/themes/sobriety/js/sobriety.ui.init.js @@ -0,0 +1,9 @@ +/** + * Initialize jQuery UI and Gallery Plugin elements + */ + +$(document).ready(function() { + $.ui.gallery_dialog.defaults.position = "top"; + //$.ui.gallery_dialog.defaults.show = "slide"; + $.ui.dialog.defaults.draggable = false; +}); diff --git a/themes/okat_dark/js/ui.init.js b/themes/sobriety/js/ui.init.js similarity index 70% rename from themes/okat_dark/js/ui.init.js rename to themes/sobriety/js/ui.init.js index 88139e22..4393a04a 100644 --- a/themes/okat_dark/js/ui.init.js +++ b/themes/sobriety/js/ui.init.js @@ -1,43 +1,38 @@ /** - * Initialize jQuery UI and Gallery Plugin elements + * Initialize jQuery UI and Gallery Plugins */ $(document).ready(function() { - $(".fancyclass").fancybox(); - // Initialize Superfish menus - $("ul.g-menu").addClass("sf-menu"); - $('ul.sf-menu').superfish({ + // Initialize Superfish menus (hidden, then shown to address IE issue) + $("#g-site-menu .g-menu").hide().addClass("sf-menu"); + /*$("#g-site-menu .g-menu").superfish({ delay: 500, animation: { opacity:'show', height:'show' }, + pathClass: "g-selected", speed: 'fast' - }); - $("#g-site-menu").css("display", "block"); - - // Initialize short forms - $(".g-short-form").gallery_short_form(); - + }).show();*/ // Initialize status message effects $("#g-action-status li").gallery_show_message(); // Initialize dialogs - $("#g-login-link").addClass("g-dialog-link"); $(".g-dialog-link").gallery_dialog(); - // Initialize view menu + // Initialize short forms + $(".g-short-form").gallery_short_form(); + + // Apply jQuery UI icon, hover, and rounded corner styles + $("input[type=submit]:not(.g-short-form input)").addClass("ui-state-default ui-corner-all"); if ($("#g-view-menu").length) { $("#g-view-menu ul").removeClass("g-menu").removeClass("sf-menu"); $("#g-view-menu a").addClass("ui-icon"); } - // Apply jQuery UI button css to submit inputs - $("input[type=submit]:not(.g-short-form input)").addClass("ui-state-default ui-corner-all"); - - // Apply styles and icon classes to g-context-menu + // Apply jQuery UI icon and hover styles to context menus if ($(".g-context-menu").length) { $(".g-context-menu li").addClass("ui-state-default"); $(".g-context-menu a").addClass("g-button ui-icon-left"); @@ -48,8 +43,11 @@ $(document).ready(function() { }); } - // Album view only - if ($("#g-album-grid").length) { + // Remove titles for menu options since we're displaying that text anyway + $(".sf-menu a, .sf-menu li").removeAttr("title"); + + // Album and search results views + /*if ($("#g-album-grid").length) { // Set equal height for album items and vertically align thumbnails/metadata $('.g-item').equal_heights().gallery_valign(); @@ -66,10 +64,16 @@ $(document).ready(function() { // Initialize the contextual menu $(this).gallery_context_menu(); // Set the hover item's height - //$(this).height("auto"); + $(this).height("auto"); var context_menu = $(this).find(".g-context-menu"); - var adj_height = $(this).height() + context_menu.height(); - $(this).height(adj_height); + var adj_height = $(this).height() + context_menu.height(); + if ($(this).next().height() > $(this).height()) { + $(this).height($(this).next().height()); + } else if ($(this).prev().height() > $(this).height()) { + $(this).height($(this).prev().height()); + } else { + $(this).height(adj_height); + } }, function() { // Reset item height and position @@ -87,34 +91,29 @@ $(document).ready(function() { // Remove the placeholder and hover class from the item $(this).removeClass("g-hover-item"); $("#g-place-holder").remove(); - $(".fancyclass").fancybox(); - } + } ); - } - - // Photo/Item item view lightbox - if ($("#g-item-box").length) { - $(this).gallery_context_menu(); - } - + }*/ // Photo/Item item view - if ($("#g-item").length) { + if ($("#g-photo,#g-movie").length) { // Ensure the resized image fits within its container - $("#g-item").gallery_fit_photo(); + $("#g-photo,#g-movie").gallery_fit_photo(); // Initialize context menus - var resize = $("#g-item").gallery_get_photo(); - $(resize).hover(function(){ + $("#g-photo,#g-movie").hover(function(){ $(this).gallery_context_menu(); }); // Add scroll effect for links to named anchors - $.localScroll({ + /*$.localScroll({ queue: true, duration: 1000, hash: true - }); + });*/ + + $(this).find(".g-dialog-link").gallery_dialog(); + $(this).find(".g-ajax-link").gallery_ajax(); } // Initialize button hover effect diff --git a/themes/sobriety/theme.info b/themes/sobriety/theme.info new file mode 100644 index 00000000..545a0815 --- /dev/null +++ b/themes/sobriety/theme.info @@ -0,0 +1,8 @@ +name = "Sobriety" +description = "A clean and sober theme from http://stopdesign.com/templates/photos/, by Douglas Bowman." +version = 1 +author = "Romain LE DISEZ" +site = 1 +admin = 0 +;wind commit = 3b05db2685d92ca538d7993c960b06ea32f3a8df +;wind date = Wed Jun 23 11:16:56 2010 -0700 diff --git a/themes/sobriety/thumbnail.png b/themes/sobriety/thumbnail.png new file mode 100644 index 00000000..343c3f2d Binary files /dev/null and b/themes/sobriety/thumbnail.png differ diff --git a/themes/sobriety/views/album.html.php b/themes/sobriety/views/album.html.php new file mode 100644 index 00000000..b9072e2b --- /dev/null +++ b/themes/sobriety/views/album.html.php @@ -0,0 +1,42 @@ + + +
    + album_top() ?> +

    title) ?>

    +
    description)) ?>
    +
    + +
      + + $child): ?> + + is_album()): ?> + + +
    • + thumb_top($child) ?> + + thumb_img(array("class" => "g-thumbnail")) ?> + + thumb_bottom($child) ?> + context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?> +

      + title) ?>

      +
        + thumb_info($child) ?> +
      +
      • + + + admin || access::can("add", $item)): ?> + id") ?> +
    • Add some.", + array("attrs" => html::mark_clean("href=\"$addurl\" class=\"g-dialog-link\""))) ?>
      • + +
      • + + +
    +album_bottom() ?> + +paginator() ?> diff --git a/themes/stopdesign/views/block.html.php b/themes/sobriety/views/block.html.php similarity index 100% rename from themes/stopdesign/views/block.html.php rename to themes/sobriety/views/block.html.php diff --git a/themes/sobriety/views/dynamic.html.php b/themes/sobriety/views/dynamic.html.php new file mode 100644 index 00000000..a8a4d362 --- /dev/null +++ b/themes/sobriety/views/dynamic.html.php @@ -0,0 +1,29 @@ + +
    +
    + dynamic_top() ?> +
    +

    +
    + +
      + $child): ?> +
    • "> + thumb_top($child) ?> + + photo + +

      title) ?>

      + thumb_bottom($child) ?> +
        + thumb_info($child) ?> +
      +
      • + +
    +dynamic_bottom() ?> + +paginator() ?> diff --git a/themes/sobriety/views/form_uploadify.html.php b/themes/sobriety/views/form_uploadify.html.php new file mode 100644 index 00000000..62171c04 --- /dev/null +++ b/themes/sobriety/views/form_uploadify.html.php @@ -0,0 +1,169 @@ + + + + + + +
      +
    • + suhosin.session.encrypt setting from Suhosin. You must disable this setting to upload photos.", + array("encrypt_url" => "http://www.hardened-php.net/suhosin/configuration.html#suhosin.session.encrypt", + "suhosin_url" => "http://www.hardened-php.net/suhosin/")) ?> +
      • +
    + + +
    +

    + +

    +
      + parents() as $i => $parent): ?> + > title) ?> + +
    • title) ?>
      • +
    +
    +*/ +?> + +
    + + +
    + +
    +
      +
    • 0 KB 0 KB
      • +
      • +
    • n/a
      • +
    • n/a, n/a
      • +
    +
    + +
      +
    +
    +*/ +?> diff --git a/themes/sobriety/views/movie.html.php b/themes/sobriety/views/movie.html.php new file mode 100644 index 00000000..158857db --- /dev/null +++ b/themes/sobriety/views/movie.html.php @@ -0,0 +1,19 @@ + +
    + photo_top() ?> + + paginator() ?> + +
    + resize_top($item) ?> + movie_img(array("class" => "g-movie", "id" => "g-item-id-{$item->id}")) ?> + resize_bottom($item) ?> +
    + +
    +

    title) ?>

    +
    description)) ?>
    +
    + + photo_bottom() ?> +
    diff --git a/themes/sobriety/views/no_sidebar.html.php b/themes/sobriety/views/no_sidebar.html.php new file mode 100644 index 00000000..a9eb0e3e --- /dev/null +++ b/themes/sobriety/views/no_sidebar.html.php @@ -0,0 +1,6 @@ + +
      +
    • +
      "> +
      • +
    diff --git a/themes/sobriety/views/page.html.php b/themes/sobriety/views/page.html.php new file mode 100644 index 00000000..cf10b85e --- /dev/null +++ b/themes/sobriety/views/page.html.php @@ -0,0 +1,138 @@ + + + + + + + <? if ($page_title): ?> + <?= $page_title ?> + <? else: ?> + <? if ($theme->item()): ?> + <? if ($theme->item()->is_album()): ?> + <?= t("Browse Album :: %album_title", array("album_title" => $theme->item()->title)) ?> + <? elseif ($theme->item()->is_photo()): ?> + <?= t("Photo :: %photo_title", array("photo_title" => $theme->item()->title)) ?> + <? else: ?> + <?= t("Movie :: %movie_title", array("movie_title" => $theme->item()->title)) ?> + <? endif ?> + <? elseif ($theme->tag()): ?> + <?= t("Browse Tag :: %tag_title", array("tag_title" => $theme->tag()->name)) ?> + <? else: /* Not an item, not a tag, no page_title specified. Help! */ ?> + <?= t("Gallery") ?> + <? endif ?> + <? endif ?> + + " type="image/x-icon" /> + css("_DISABLED_yui/reset-fonts-grids.css") ?> + css("_DISABLED_superfish/css/superfish.css") ?> + css("_DISABLED_themeroller/ui.base.css") ?> + css("_DISABLED_gallery.common.css") ?> + css("screen.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("_DISABLED_superfish/js/superfish.js") ?> + script("_DISABLED_jquery.localscroll.js") ?> + script("sobriety.ui.init.js") ?> + script("ui.init.js") ?> + + head() they get combined */ ?> + page_subtype == "photo"): ?> + script("_DISABLED_jquery.scrollTo.js") ?> + script("_DISABLED_gallery.show_full_size.js") ?> + page_subtype == "movie"): ?> + script("flowplayer.js") ?> + + + head() ?> + + + + body_attributes() ?>> + page_top() ?> +
    + site_status() ?> +
    +
    + + + + + + user_menu() ?> + header_top() ?> + + + + + + header_bottom() ?> +
    + + item() && !empty($parents)): ?> + + +
    +
    +
    +
    +
    + messages() ?> + +
    +
    +
    +
    + page_subtype != "login"): ?> + + +
    +
    + +
    + page_bottom() ?> + + diff --git a/themes/stopdesign/views/paginator.html.php b/themes/sobriety/views/paginator.html.php similarity index 100% rename from themes/stopdesign/views/paginator.html.php rename to themes/sobriety/views/paginator.html.php diff --git a/themes/sobriety/views/permissions_form.html.php b/themes/sobriety/views/permissions_form.html.php new file mode 100644 index 00000000..e8a67c67 --- /dev/null +++ b/themes/sobriety/views/permissions_form.html.php @@ -0,0 +1,97 @@ + +
    + + + + + + + + + + + + + + + + + name, $item) ?> + name, $item) ?> + name, $item) ?> + + + + + + + + + + + + + + + + + + + + + +
    display_name) ?>
    name) ?> + " + title="for_html_attr() ?>" + alt="for_html_attr() ?>" /> + + " alt="for_html_attr() ?>" /> + + + + " alt="for_html_attr() ?>" /> + + + " alt="for_html_attr() ?>" /> + + + + " alt="for_html_attr() ?>" /> + + + " alt="for_html_attr() ?>" /> + + + + " alt="for_html_attr() ?>" /> + + id == 1): ?> + " alt="for_html_attr() ?>" title="for_html_attr() ?>"/> + + + " alt="for_html_attr() ?>" /> + + + + id == 1): ?> + " title="for_html_attr() ?>" alt="for_html_attr() ?>" /> + + + " alt="for_html_attr() ?>" /> + + + + " alt="for_html_attr() ?>" /> + +
    +
    +
    + +
    \ No newline at end of file diff --git a/themes/sobriety/views/photo.html.php b/themes/sobriety/views/photo.html.php new file mode 100644 index 00000000..c5393547 --- /dev/null +++ b/themes/sobriety/views/photo.html.php @@ -0,0 +1,39 @@ + + +item())): ?> + + + + +
    + photo_top() ?> + + paginator() ?> + + + +
    +

    title) ?>

    +
    description)) ?>
    +
    + + + photo_bottom() ?> +
    diff --git a/themes/sobriety/views/sidebar.html.php b/themes/sobriety/views/sidebar.html.php new file mode 100644 index 00000000..ecb440af --- /dev/null +++ b/themes/sobriety/views/sidebar.html.php @@ -0,0 +1,17 @@ + +sidebar_top() ?> +
    + + album_menu() ?> + + photo_menu() ?> + + movie_menu() ?> + + tag_menu() ?> + +
    + + +sidebar_blocks() ?> +sidebar_bottom() ?> diff --git a/themes/sobriety/views/sobriety_actions.html.php b/themes/sobriety/views/sobriety_actions.html.php new file mode 100644 index 00000000..a781a558 --- /dev/null +++ b/themes/sobriety/views/sobriety_actions.html.php @@ -0,0 +1,22 @@ + +theme, ""); + +?> +elements['add_menu']->elements) || isset($menu->elements['options_menu']->elements) ): ?> +
    +

    +
    +
      + elements['add_menu']->elements as $menu_element): ?> +
    • label ?>
      • + + elements['options_menu']->elements as $menu_element): ?> +
    • label ?>
      • + +
    +
    +
    + \ No newline at end of file diff --git a/themes/sobriety/views/sobriety_styles.html.php b/themes/sobriety/views/sobriety_styles.html.php new file mode 100644 index 00000000..94a9310c --- /dev/null +++ b/themes/sobriety/views/sobriety_styles.html.php @@ -0,0 +1,86 @@ + + + diff --git a/themes/stopdesign/css/aus04.css b/themes/stopdesign/css/aus04.css deleted file mode 100644 index 7b8321c3..00000000 --- a/themes/stopdesign/css/aus04.css +++ /dev/null @@ -1,68 +0,0 @@ -/* ------------------------------------------------ -Photos -Author: Douglas Bowman -Version: 9 Nov 2004 ------------------------------------------------ */ - -body { - background:#ccb url("img/bg.jpg") repeat-x 0 0; - } - - -/* Header ------------------------------------------------ */ -#path { - border-color:#bba; - } -h1 { - color:#543; - border-color:#ddc; - } -h1 strong { - color:#234; - } -#title h1 { - width:733px; - } -.galleryinfo fieldset { - border-color:#bba; - } - - -/* Index ------------------------------------------------ */ -#gallerydesc { - margin:-110px 20px 0 398px; - } - - -/* Individual photo ------------------------------------------------ */ -#ind { - background-color:#bba; - } -html>body #ind { - background-color:transparent; - } -#comments-form td, #comments-form th, .commentlist dd, .commentlist li { - border-color:#AAAB9B; - } - - -/* Count ------------------------------------------------ */ -#info p.count { - border-color:#ddc; - } -.galleryinfo .count { - background:#bba; - } - - -/* Footer ------------------------------------------------ */ -#footer p { - border-color:#ddc; - color:#887; - } diff --git a/themes/stopdesign/css/custom.css b/themes/stopdesign/css/custom.css deleted file mode 100644 index ad0af9a9..00000000 --- a/themes/stopdesign/css/custom.css +++ /dev/null @@ -1,81 +0,0 @@ -/* ------------------------------------------------ -Photo Gallery Templates: -Custom Dimensions ------------------------------------------------ */ - -/* This file containes isolated measurement values you should change if you'd like -to use different dimensions for the main photo. All measurements are based off main -photos' maximum width. Default "MaxWidth" for photos (per template docs) is 480. -------------------------------------------------------------------------------------- */ - - - -/* Sets width of main (center) column. -[value] = MaxWidth + 20 -EG: 480 + 20 = 500 ------------------------------------------------ */ -.main { - width:660px; - } - -/* Determines position of prev/next thumbnails. -Measurement is distance from center of main -photo to the nearest edge of slide background -image. */ -#prev { - /* [value] = (MaxWidth / 2) + 22 */ - right:342px; - } -#next { - /* [value] = (MaxWidth / 2) + 25 */ - left:345px; - } - -/* Determines offset of prev/next hoverable -regions that overlay the main photo. Measurement -is distance from nearest edge of slide -background image back to center of main photo. */ -#prev a strong { - /* [value] = 0 - (MaxWidth / 2) - 22 */ - right:-342px; - } -#next a strong { - /* [value] = 0 - (MaxWidth / 2) - 25 */ - left:-345px; - } - -/* Determines position of title and description. -Measurement is distance from center of main -photo to left edge of content. -Note: Second value for background position -should always be 0. */ -#desc h1, #desc p { - /* [value] = (MaxWidth / 2) + 25 */ - background-position:345px 0; - padding-left:345px; - } - -/* Determines position of meta info such as -Photo x of y, date, & keywords. Measurement is -distance from center of main photo to left -edge of content. */ -#meta ul { - /* [value] = (MaxWidth / 2) + 25 */ - padding-right:345px; - } - -/* If customizing the photo dimensions, one -more value needs to change in the Individual -Photo template (t_photo.php). Search for the -following tag: -<$MTSetVar2 name="padvalue" value="480"$> -and change the value to your new photo MaxWidth. - - - -/* End of custom values -------------------------------------------------------------------------------------- */ - - - diff --git a/themes/stopdesign/css/custom.gallery3-dialog.css b/themes/stopdesign/css/custom.gallery3-dialog.css deleted file mode 100644 index 549a8224..00000000 --- a/themes/stopdesign/css/custom.gallery3-dialog.css +++ /dev/null @@ -1,113 +0,0 @@ -.ui-widget-overlay { - background: #000; - opacity: 0.7; - position: fixed; - top: 0; - bottom: 0; - left: 0; - right: 0; -} - -.ui-dialog { - background: #e5e5e5; - position: absolute; - /*top: 25px !important;*/ - -moz-box-shadow: 10px 10px 5px #fff; - box-shadow: 10px 10px 5px #fff; -} - -.ui-dialog-titlebar { - display: none; -} - -.ui-dialog-titlebar-close { - display: none; -} - -.ui-dialog fieldset { - border: 0; -} - -.ui-dialog fieldset legend { - text-align: center; - font-weight: bold; - font-size: 1em; -} - -/*#gDialog > form > fieldset { - border: 0; - margin: 0; - padding: 0; -} - -#gDialog > form > fieldset > legend { - font-weight: bold; -} - -#gDialog > form > fieldset > ul { - list-style-type: none; - margin: 0; - padding: 0; -} - -#gDialog > form > fieldset > ul > li > input { - width: 100%; -} - -#gPermissions { - - -}*/ -/* Simple uploader ~~~~~~~~~~~~~~~~~~~~~~~ */ - -#g-add-photos-canvas { - border: 1px solid #ccc; - height: 200px; - margin: .5em 0; - overflow: auto; - width: 469px; -} - -#g-add-photos-status { - border: 1px solid #ccc; - height: 125px; - margin: .5em 0; - overflow: auto; - width: 469px; -} - -#g-add-photos button { - float: right; - margin-bottom: .5em; - margin-left: .5em; -} - -#g-add-photos-status li { - text-align: left; - padding-left: 2em; -} - -#g-add-photos-status li.g-success { - background: #d9efc2 url('images/ico-success.png') no-repeat .4em 50%; - width: 429px; -} - -#g-add-photos-status li.g-error { - background: #f6cbca url('images/ico-error.png') no-repeat .4em 50%; - width: 429px; -/* color: #f00;*/ -} - -#g-add-photos-button { - background: #DFEFFC; - border: 1px solid #C5DBEC; - color: #2E6E9E -} - -#g-add-photos p { - margin: 0 -} - -#g-add-photos .g-breadcrumbs li { - padding-top: .5em; -} diff --git a/themes/stopdesign/css/custom.gallery3.css b/themes/stopdesign/css/custom.gallery3.css deleted file mode 100644 index f9ffae3c..00000000 --- a/themes/stopdesign/css/custom.gallery3.css +++ /dev/null @@ -1,108 +0,0 @@ -body { -background-image: url("../img/bg.jpg"); -} -.thumb a strong { - /* MaxWidth / 2 */ - width: 320px; - /* MaxHeight */ - height: 480px; -} -.vertical .thumb a strong { - /* MaxWidth / 2 */ - width: 180px; - /* MaxHeight */ - height: 480px; -} -.vertical .main { - width: 380px; -} -.thumb a strong { - margin-top: 11px; -} -.thumb a:hover strong { - background-position:50% 0px !important; -} - -.thumb a { - /* thumb size + 31 */ - width: 231px !important; - height: 231px !important; -} - -#prev, #next { - /* thumb size + 34 */ - width: 234px; -} -#prev a, #next a { - /* thumb size + 34 */ - width: 231px; -} - -#desc, #meta { - /* thumb size + 80 */ - top:280px; -} - -.slideset .thumb a { - position: relative; - line-height: 234px !important; - text-align: center; - text-indent: 0 !important; - font-size: 12px !important; -} - -.slideset .thumb a span { - position: absolute; - line-height: 12px; - bottom: 2px; - width: 100%; - font-size:90%; - line-height:1.4em; - font-family:"Gill Sans","Trebuchet MS",Verdana,Sans-serif; - font-weight:normal; - text-transform:uppercase; - letter-spacing:.2em; - text-align:center; - color:#333; -} - -.slideset .thumb a:hover span { - /*background: #ddd;*/ -} - -.galleryinfo p { - position: relative; -} - -.galleryinfo .count { - text-align: center; -} - -#next-page { - position: absolute; - right: 0; - clear: both; -} - -#footer #credits { - margin: 0; - padding: 0; - list-style-type: none; -} -#footer #credits li { - background: none; - padding: 0; - display: inline; -} - -#meta ul#actions { - margin-top: 10px; -} - -#meta ul#actions li:first-child { - background:url("../img/divider_l.gif") no-repeat 100% 0; - padding-top:10px; - } -html>body #meta ul#actions li:first-child { - background-image:url("../img/divider_l.png"); - } diff --git a/themes/stopdesign/css/photos.css b/themes/stopdesign/css/photos.css deleted file mode 100644 index 84367843..00000000 --- a/themes/stopdesign/css/photos.css +++ /dev/null @@ -1,1056 +0,0 @@ -/* ------------------------------------------------ -Photo Gallery Templates: Main Style Sheet -Author: Douglas Bowman -Version: 1.1 - 10 May 2006 -The design and Movable Type templates that -build these pages are available for anyone to -download and use: -http://stopdesign.com/templates/photos/ ------------------------------------------------ */ - -body { - background:#ddd url("../img/bg_page.jpg") repeat-x 0 0; - margin:0; - padding:0; - font:small Verdana,Sans-serif; - color:#333; - } -.title, .index { - text-align:center; - } -#content { - position:relative; - margin:1.6em 0 0; - padding:26px 15px 15px; - font-size:85%; - line-height:1.6; - } -.photosolo #content { - padding:25px 0 15px; - } -.index #content, .archive #content, .recentcomments #content, .comments-entry #content { - width:720px; - margin-left:auto; - margin-right:auto; - } -.title #content { - width:733px; - margin-left:auto; - margin-right:auto; - padding:40px 20px 0; - text-align:left; - } -.comments-entry #content { - margin-top:1em; - padding-top:0; - } - - -/* =Links ------------------------------------------------ */ -a, a:visited { - color:#258; - text-decoration:none; - border-bottom:1px solid #469; - outline:none; - } -html>body a, html>body a:visited { - border-bottom-style:dotted; - } -a:hover, a:active { - color:#933; - border-color:#b55; - border-bottom-style:solid; - } -a img, a.btn, a.btn:visited, a.i, a.i:visited, a.i:hover { - border-width:0; - } -a.btn img, a.i>img { - position:relative; - top:2px; - } - - -/* =Headings ------------------------------------------------ */ -h2 { - margin:.5em 0 .75em; - font:145% "Trebuchet MS",Verdana,Sans-serif; - color:#974; - } -h2 .btn { - margin-left:.25em; - font-weight:normal; - color:#666; - } -.index h2, .archive h2, .recentcomments h2 { - background:url("../img/slide_minis.gif") no-repeat 50% 0; - margin:0 0 8px; - padding:24px 0 0; - font-size:100%; - line-height:1.4em; - font-family:"Gill Sans","Trebuchet MS",Verdana,Sans-serif; - font-weight:normal; - text-transform:uppercase; - letter-spacing:.2em; - text-align:center; - color:#333; - } -.galleries h2 { - position:relative; - top:-10px; - margin-bottom:0; - } - - -/* =Lists ------------------------------------------------ */ -ul { - margin:.5em 0 1.5em; - padding:0; - } -li { - background:url("../img/bullet_white.gif") no-repeat 5px .55em; - margin:0; - padding:0 0 0 15px; - list-style:none; - } -dl { - margin:.5em 0 1em; - padding:0; - } -dt { - font-weight:bold; - } -dd { - margin:0 0 1em; - padding:0; - } - - -/* =Forms ------------------------------------------------ */ -form { - margin:0 0 .75em; - } -input.text, textarea { - border:1px solid; - border-color:#999 #fff #fff #999; - } -input.text:focus, textarea:focus { - background:#ffc; - } -#btn-preview, #btn-post { - background:#888; - padding:2px 5px; - border:2px solid; - border-color:#aaa #666 #666 #aaa; - font:100% Verdana,Sans-serif; - text-transform:uppercase; - color:#fff; - } -#btn-post { - background:#354; - border-color:#576 #243 #243 #576; - } - - -/* =Misc ------------------------------------------------ */ -p { - margin:0 0 .75em; - } -.buttons p { - margin:0; - } -.note, .error { - color:#c33; - } -.inset, .inset2 { - float:left; - margin:3px 10px 5px 0; - } -.inset2 { - float:right; - margin:3px 0 5px 10px; - } -img.inset, img.inset2 { - display:block; - } -.reset { - clear:both; - display:block; - height:1px; - font-size:1px; - line-height:1px; - } -hr.reset { - overflow:hidden; - visibility:hidden; - } -th, td { - text-align:left; - vertical-align:top; - } -input, textarea, select, code { - margin:1px 0; - font:117%/1.2em Monaco,Monospace; - } -.mainbutton { - margin:0; - padding:5px 0 10px; - font-size:100%; - text-align:center; - } -.galleries .mainbutton { - margin:0; - } -#commentblock .mainbutton { - padding-top:0; - } -em.date { - font-style:normal; - } - - -/* =Path -Breadcrumb navigation that gets positioned to -the top of the page. ------------------------------------------------ */ -#path { - background:#000 url("../img/bg_path.gif"); - position:absolute; - top:0; - left:0; - width:100%; - margin:0; - padding:4px 0 6px; - border-bottom:3px solid #555; - font-size:85%; - line-height:1.6em; - color:#777; - text-align:center; - } -#path a { - font-weight:normal; - border-color:#777; - color:#888; - } - - -/* =Header ------------------------------------------------ */ -h1 { - margin:0 0 3px; - padding:0 0 .35em; - border-bottom:1px solid #ddd; - font:200% "Gill Sans","Trebuchet MS",Verdana,Sans-serif; - line-height:1.2em; - text-align:center; - text-transform:uppercase; - letter-spacing:.15em; - } -.title h1 { - margin:0; - padding:0 0 10px; - border-width:0; - } -.title h1 a, .title h1 a:visited { - border-bottom-width:0; - border-style:none; - } - -h1 a, h1 a:hover, .auto #titleimg a { - border-style:none; - } -h1 em { - margin-left:.25em; - padding-left:.5em; - border-left:1px solid #aaa; - font:66% Verdana,Sans-serif; - color:#666; - } -h1 img { - display:block; - } - - -/* =Auto-generated title images ------------------------------------------------ */ -.auto h1 { - margin:10px 0 .5em; - padding:0; - border-width:0; - font-size:170%; - line-height:1.2em; - color:#333; - text-align:left; - text-transform:none; - letter-spacing:0; - } -.auto #titleimg { - background:#bbb; - position:relative; - top:3px; - left:3px; - float:left; - margin:0 0 10px 0; - padding:0; - border-width:0; - } -html>body .auto #titleimg { - background:url("../img/bg_shadow.png"); - } -.auto #titleimg img { - display:block; - position:relative; - top:-3px; - left:-3px; - border:10px solid #fff; - } - - -/* =Gallery Description -Text block appearing on Gallery Title page ------------------------------------------------ */ -#gallerydesc { - position:relative; - margin:-110px 29px 0 405px; - font-size:100%; - } -.auto #gallerydesc, .v #gallerydesc { - float:right; - width:218px; - position:static; - margin:0; - } -.v #gallerydesc { - width:338px; - } -#gallerydesc p { - margin:0 0 .75em; - } -#gallerydesc .date { - display:block; - margin-bottom:.5em; - } - - -/* =Gallery Listing -Module showing all galleries in system ------------------------------------------------ */ -#secondary { - float:left; - width:705px; - padding:10px 0 0 15px; - margin:0; - } -.index .module { - float:left; - width:210px; - margin:0 17px 0 0; - padding:0 4px; - text-align:left; - } - -.galleries { - background:#eee; - float:left; - width:100%; - margin:0 0 15px; - position:relative; - } -.index .galleries { - margin-bottom:5px; - } -.galleries ul { - float:left; - margin-left:0; - margin-bottom:0; - list-style:none; - text-align:left; - } -.galleries li { - background-image:none; - float:left; - position:relative; - width:220px; - height:6.4em; - overflow:hidden; - margin-bottom:0; - padding:75px 0 1.6em 15px; - } -.archive .galleries li { - height:10.5em; - } -.galleries h3 { - margin:0 10px 0 4px; - font-size:100%; - } -.galleries h3 a, .galleries a.img, .galleries h3 a:visited { - border-width:0; - } -.galleries .img { - position:absolute; - top:0; - left:15px; - } -.galleries .img img { - display:block; - } -.galleries p { - margin:0 10px 0 4px; - } -.galleries div { - margin:0 4px; - } - - -/* =Auto-generated Gallery Index -Slide-formatted list of all galleries ------------------------------------------------ */ -.useslides ul { - text-align:center; - } -.useslides li { - padding-top:128px; - } -.useslides .thumb { - position:absolute; - top:0; - left:62px; - } -.useslides p { - margin-right:4px; - } - - -/* Feed links -Links to feeds appearing at bottom of Gallery Archive ------------------------------------------------ */ -#feeds { - float:left; - width:100%; - margin:0 0 10px; - } -#feeds ul { - margin:15px 0 0; - padding:9px 0; - list-style:none; - text-align:center; - } -#feeds li { - background-color:transparent; - background-image:none; - float:none; - width:auto; - display:inline; - margin:0 2px; - padding:0; - text-align:center; - } -#feeds li a { - background-color:#eee; - padding:8px 5px; - border:1px solid #fff; - } -#feeds li a:hover { - background-color:#ddd; - } - - -/* =GalleryData -Table of stats appearing on Gallery Index ------------------------------------------------ */ -.gallerydata { - width:100%; - border-top:1px solid #ccc; - font-size:100%; - } -.gallerydata th, .gallerydata td { - padding:5px; - border-bottom:1px solid #ccc; - font-weight:normal; - vertical-align:middle; - } -.gallerydata td { - text-align:right; - white-space:nowrap; - } - - -/* =FavList -Module on Index page displaying tiny thumbnails -of most recent favorite photos ------------------------------------------------ */ -#favlist { - float:left; - width:204px; - margin:0 -3px 0 0; - padding:0 0 0 6px; - list-style:none; - } -#favlist li { - background:url("../img/bg_slide_sm.gif") 0 0 no-repeat; - float:left; - width:62px; - margin:0 6px 6px 0; - padding:0; - } -html>body #favlist li { - background-image:url("../img/bg_slide_sm.png"); - } -#favlist table { - width:62px; - height:62px; - margin:0; - border-collapse:collapse; - font-size:1px; - } -#favlist td { - padding:0 2px 2px 0; - text-align:center; - vertical-align:middle; - } -#favlist li a { - border-width:0; - } - - -/* =Gallery Info -Title, description, & prefs on Photo Gallery page ------------------------------------------------ */ -.galleryinfo { - clear:left; - float:left; - width:22%; - margin:0; - line-height:1.4em; - } -.galleryinfo h1 { - margin:0 0 .5em; - text-align:left; - text-transform:none; - letter-spacing:0; - } -.galleryinfo .desc { - line-height:1.6em; - margin-bottom:1em; - } -.galleryinfo form { - margin:0 0 .5em; - padding:5px 0; - } -.galleryinfo fieldset { - margin:0 0 .75em; - padding:.25em 0 .5em; - border-width:0; - border-bottom:1px dotted #ccc; - } -.galleryinfo form strong { - display:block; - margin:0; - padding:0 0 .25em; - color:#222; - } -.galleryinfo fieldset div { - margin:0 0 .25em; - } - - -/* =Thumbs -Reusable style for thumbnail photos as slides ------------------------------------------------ */ -.thumb { - background:url("../img/bg_slide.gif") 0 0 no-repeat; - display:block; - float:left; - margin:0; - padding:0 3px 3px 0; - } -html>body .thumb { - background-image:url("../img/bg_slide.png"); - } -.thumb span { - background-repeat:no-repeat; - background-position:50% 104px; - display:block; - } -.thumbv span { - background-position:9px 50%; - } -.thumb em { - background-repeat:no-repeat; - background-position:50% 50%; - display:block; - } -.thumb a, .thumb a:link, .thumb a:visited { - background:none !important; - display:block; - width:120px; - height:120px; - border:none; - text-indent:-9999px; - font-size:1px; - line-height:1px; - } - - -/* =Slideset -Normal group of slide-like thumbnails ------------------------------------------------ */ -.slideset { - float:right; - position:relative; - width:75%; - margin:0 0 15px; - padding:0; - list-style:none; - line-height:1.4em; - } -.slideset .thumb { - float:left; - margin:0 10px 10px 0; - } - - -/* =Individual Photo ------------------------------------------------ */ -/* NOTE: - See [custom.css] to customize your own - photo dimensions with override values. */ -.main { - width:500px; - margin:0 auto; - text-align:center; - } -#photo { - margin:0 0 10px; - } -#photo strong { - background:#bbb; - position:relative; - display:block; - top:3px; - left:3px; - margin:0 0 10px 0; - border-width:0; - } -html>body #photo strong { - background:url("../img/bg_shadow.png"); - } -#photo img { - display:block; - position:relative; - top:-3px; - left:-3px; - border:10px solid #fff; - } - - -/* =PrevNext Nav (Individual Photo template) -Thumbnails used for prev/next photo navigation ------------------------------------------------ */ -#prevnext { - position:absolute; - top:25px; - left:50%; - } -#prev, #next { - position:absolute; - top:0; - width:123px; - margin:0; - font-weight:bold; - } -#prev { - right:262px; - } -#next { - left:265px; - } -#prev a, #next a { - width:120px; - } - - -/* =PrevNextHovers (Individual Photo template) -The two hoverable regions overlaying the main photo ------------------------------------------------ */ -/* Note: - Width and height for the following - strong element is set inline using the style - attribute. Both values are automatically - determined by taking the width/height of the - main photo. - Width is ((width of main photo + 20) / 2). - Height is (height of main photo + 20). */ -#prevnext a strong { - position:absolute; - top:0; - } -#prev a strong { - background:url("../img/photonav_prev.gif") no-repeat 50% -100px; - right:-262px; - } -#next a strong { - background:url("../img/photonav_next.gif") no-repeat 50% -100px; - left:-265px; - } -html>body #prev a strong { - background-image:url("../img/photonav_prev.png"); - } -html>body #next a strong { - background-image:url("../img/photonav_next.png"); - } -#prev a:hover strong, #next a:hover strong, #prev a:active strong, #next a:active strong { - background-position:50% 10px; - cursor:pointer; - } - - -/* =Description (Individual Photo template) -Title and description of photo ------------------------------------------------ */ -#desc { - position:absolute; - top:170px; - right:0; - width:50%; - text-align:left; - } -#desc h1 { - background:url("../img/divider_r.gif") no-repeat 265px 0; - max-width:30em; - margin:0; - padding:10px 15px 5px 265px; - border-width:0; - font:bold 100% Verdana,Sans-serif; - line-height:1.6em; - letter-spacing:0; - text-transform:none; - text-align:left; - } -html>body #desc h1 { - background-image:url("../img/divider_r.png"); - } -#desc p { - max-width:30em; - margin:0 0 .75em; - padding:0 15px 0 0; - } -#desc p.posted { - margin-top:1.25em; - } - - -/* =Meta info (Individual Photo template) -Photo x of y, date, and keywords ------------------------------------------------ */ -#meta { - position:absolute; - top:170px; - left:0; - width:50%; - } -#meta ul { - margin:0; - padding:0 265px 0 15px; - list-style:none; - } -#meta li { - background:none; - margin:0; - padding:0; - text-align:right; - } -#meta li.count { - background:url("../img/divider_l.gif") no-repeat 100% 0; - padding-top:10px; - padding-bottom:5px; - } -html>body #meta li.count { - background-image:url("../img/divider_l.png"); - } - - -/* =Count -Miscellaneous portions of the UI that display -a total count of photos for each gallery ------------------------------------------------ */ -.count { - font-style:italic; - } -.galleryinfo .count { - background:#ccc; - display:block; - margin:0 0 .5em; - padding:2px 5px; - font-style:normal; - } -#info p.count { - margin:3em 0 1.5em; - padding:5px 0; - border:solid #bbb; - border-width:1px 0; - font-size:100%; - line-height:1.6em; - } -input.btn, .header form select { - vertical-align:middle; - font-size:100%; - } - - -/* =Comments -General div IDs and headings that surround the -comment listing for an entry. These are the divs -the JavaScript uses to hide/show comments ------------------------------------------------ */ -#commentblock { - display:block; - width:480px; - margin:0 auto; - text-align:left; - } -#commentblock h2, #commentblock p.sub { - text-align:center; - font-weight:normal; - } -#commentblock h2 { - margin-top:0; - font:100% Verdana,Sans-serif; - color:#333; - } -#commentblock h2 a { - margin-left:.25em; - font-weight:normal; - border-width:0; - color:#666; - } -#commentblock h2 a img { - position:relative; - top:2px; - } -#showcomments, #hidecomments, #addcommentbutton { - display:none; - } -#addcomment h2 { - margin-top:.5em; - text-align:left; - font:140% "Trebuchet MS",Verdana,Sans-serif; - color:#974; - } - - -/* =Comment photo -Region on comment preview/error pages that displays -the thumbnail image, photo name, date, & keywords ------------------------------------------------ */ -#comment-photo { - float:left; - width:100%; - padding:35px 0 12px; - } -#comment-photo #desc { - position:static; - width:auto; - margin-left:133px; - padding:22px 0 2px; - } -#comment-photo #desc h1 { - background:none; - padding:0; - } -#comment-photo #desc p { - margin:0; - padding:0; - } - - -/* =CommentList -List of existing comments for an entry ------------------------------------------------ */ -dl.commentlist, ul.commentlist { - margin-bottom:1.5em; - } -#commentblock .commentlist { - margin-bottom:1em; - } -.commentlist dt, .commentlist li p.commenter { - padding:8px 0 .25em; - font-weight:normal; - } -.commentlist dd, .commentlist li { - background-image:none; - padding:2px 18px 4px; - margin:0 0 .5em; - border-bottom:1px dotted #bbb; - } -.commentlist .postno { - background:url("../img/icon_pushpin.gif") no-repeat 0 50%; - border-width:0; - padding:0 0 0 18px; - margin-right:2px; - font:150% "Gill Sans","Trebuchet MS",Georgia,Serif; - color:#567; - } -.commentlist a.postno { - border-bottom-width:0; - border-style:none; - } - -p.comment-error { - margin:0 0 1.5em; - color:#c33; - } -#comment-notes { - margin-top:2em; - } -#comment-notes p { - color:#554; - } - -.commentlink, .commentlink:visited { - background:url("../img/icon_pushpin.gif") no-repeat 0 50%; - border-width:0; - padding-left:17px; - white-space:nowrap; - } -a.commentlink, a.commentlink:visited { - color:#359; - font-weight:normal; - } -a.commentlink:hover { - color:#933; - border-color:#ccb; - text-decoration:none; - } - - -/* =Recent Comments -Only used on recent comments listing page ------------------------------------------------ */ -.recentcomments .commentlist { - float:left; - width:100%; - margin:0 0 15px; - padding:0; - list-style:none; - } -.recentcomments .commentlist li { - background-color:#eee; - float:left; - width:100%; - min-height:138px; - margin:0 0 15px; - padding:0 0 15px; - border-bottom-width:0; - } -.recentcomments li p { - margin-left:148px; - margin-right:15px; - } -.recentcomments li p.commenter { - margin-left:0; - padding-top:20px; - padding-left:148px; - font-style:italic; - } -.recentcomments p.thumb { - float:left; - background-position:15px 0; - height:123px; - margin:15px 10px 0 0; - padding-left:15px; - } -.commenton { - margin-bottom:5px; - padding-top:.5em; - border-top:1px solid #ccc; - color:#888; - } -.commenton a { - font-weight:bold; - } - - -/* =Comment Form -Comment Submission form ------------------------------------------------ */ -#comments-form table { - width:100%; - margin:0; - padding:0; - border-width:0; - font-size:100%; - color:#333; - } -#comments-form td { - width:100%; - } -#comments-form td, #comments-form th { - padding:5px 10px 5px 0; - border-bottom:1px dotted #bbb; - font-weight:normal; - } -#comments-form th { - text-transform:lowercase; - white-space:nowrap; - } -#comments-form td.buttons, #comments-form th.buttons { - border-width:0; - text-align:right; - } -#comments-form label { - text-transform:lowercase; - cursor:pointer; - } -#comments-form label:hover { - color:#963; - } -#comments-form textarea { - background:#fff; - display:block; - width:97%; - color:#000; - } -#comments-form textarea:focus { - background:#ffc; - } -#comments-form form p { - margin:.5em 0; - } -#comments-form .text { - width:65%; - } - - -/* =Footer ------------------------------------------------ */ -#footer { - clear:both; - width:100%; - padding:15px 0; - font-size:85%; - line-height:1.8em; - text-align:center; - color:#888; - } -#footer p { - margin:0 15px; - padding:5px 0; - border-top:1px solid #eee; - } -#footer hr { - display:none; - } -#footer a { - font-weight:normal; - color:#678; - } -#footer a:hover, #footer a:active { - color:#933; - border-bottom-width:1px; - } diff --git a/themes/stopdesign/img/bg_page.jpg b/themes/stopdesign/img/bg_page.jpg deleted file mode 100644 index aebe2d8f..00000000 Binary files a/themes/stopdesign/img/bg_page.jpg and /dev/null differ diff --git a/themes/stopdesign/img/bg_shadow.png b/themes/stopdesign/img/bg_shadow.png deleted file mode 100644 index 25703b76..00000000 Binary files a/themes/stopdesign/img/bg_shadow.png and /dev/null differ diff --git a/themes/stopdesign/img/bg_slide.gif b/themes/stopdesign/img/bg_slide.gif deleted file mode 100644 index a801e33d..00000000 Binary files a/themes/stopdesign/img/bg_slide.gif and /dev/null differ diff --git a/themes/stopdesign/img/bg_slide.png b/themes/stopdesign/img/bg_slide.png deleted file mode 100644 index b54fa198..00000000 Binary files a/themes/stopdesign/img/bg_slide.png and /dev/null differ diff --git a/themes/stopdesign/img/bg_slide_sm.gif b/themes/stopdesign/img/bg_slide_sm.gif deleted file mode 100644 index 8ddd2c18..00000000 Binary files a/themes/stopdesign/img/bg_slide_sm.gif and /dev/null differ diff --git a/themes/stopdesign/img/bg_slide_sm.png b/themes/stopdesign/img/bg_slide_sm.png deleted file mode 100644 index 1df1a4b2..00000000 Binary files a/themes/stopdesign/img/bg_slide_sm.png and /dev/null differ diff --git a/themes/stopdesign/img/divider_l.gif b/themes/stopdesign/img/divider_l.gif deleted file mode 100644 index 88ab52d2..00000000 Binary files a/themes/stopdesign/img/divider_l.gif and /dev/null differ diff --git a/themes/stopdesign/img/divider_r.gif b/themes/stopdesign/img/divider_r.gif deleted file mode 100644 index 92605376..00000000 Binary files a/themes/stopdesign/img/divider_r.gif and /dev/null differ diff --git a/themes/stopdesign/img/photonav_next.gif b/themes/stopdesign/img/photonav_next.gif deleted file mode 100644 index f2f572e1..00000000 Binary files a/themes/stopdesign/img/photonav_next.gif and /dev/null differ diff --git a/themes/stopdesign/img/photonav_prev.gif b/themes/stopdesign/img/photonav_prev.gif deleted file mode 100644 index 2c774ae7..00000000 Binary files a/themes/stopdesign/img/photonav_prev.gif and /dev/null differ diff --git a/themes/stopdesign/js/comments.js b/themes/stopdesign/js/comments.js deleted file mode 100644 index 0f92405f..00000000 --- a/themes/stopdesign/js/comments.js +++ /dev/null @@ -1,73 +0,0 @@ - diff --git a/themes/stopdesign/js/rememberMe.js b/themes/stopdesign/js/rememberMe.js deleted file mode 100644 index 71fcb2f0..00000000 --- a/themes/stopdesign/js/rememberMe.js +++ /dev/null @@ -1,60 +0,0 @@ - diff --git a/themes/stopdesign/js/stopdesign.ui.init.js b/themes/stopdesign/js/stopdesign.ui.init.js deleted file mode 100644 index 895f9333..00000000 --- a/themes/stopdesign/js/stopdesign.ui.init.js +++ /dev/null @@ -1,9 +0,0 @@ -/** - * Initialize jQuery UI and Gallery Plugin elements - */ - -$(document).ready(function() { - $(".g-dialog-link").gallery_dialog('option', 'position', 'top'); - $(".g-dialog-link").gallery_dialog('option', 'draggable', false); - $(".g-ajax-link").gallery_ajax(); -}); diff --git a/themes/stopdesign/theme.info b/themes/stopdesign/theme.info deleted file mode 100644 index 660cda32..00000000 --- a/themes/stopdesign/theme.info +++ /dev/null @@ -1,6 +0,0 @@ -name = "Stop Design" -description = "A clean and sober theme from stopdesign.com, by Douglas Bowman." -version = 1 -author = "Romain LE DISEZ" -site = 1 -admin = 0 diff --git a/themes/stopdesign/thumbnail.png b/themes/stopdesign/thumbnail.png deleted file mode 100644 index 53abcecf..00000000 Binary files a/themes/stopdesign/thumbnail.png and /dev/null differ diff --git a/themes/stopdesign/views/album.html.php b/themes/stopdesign/views/album.html.php deleted file mode 100644 index f235ecd2..00000000 --- a/themes/stopdesign/views/album.html.php +++ /dev/null @@ -1,61 +0,0 @@ - - -
    -

    title) ?>

    -

    description)) ?>

    -
    - -
      - - - $child): ?> - is_album() ): ?> -
    • title) ?>
      • - - - - $child): ?> - is_album() ): ?> -
    • title) ?>
      • - - - -
    - -
    -

    - ($page - 1) * $page_size + 1, - "to_number" => min($page * $page_size, $children_count), - "count" => $children_count)) ?> - - - $page - 1))) ?>" accesskey="z">« - -   - - $page + 1))) ?>" accesskey="x"> » - -

    - - -

    Actions

    - - -
    \ No newline at end of file diff --git a/themes/stopdesign/views/no_sidebar.html.php b/themes/stopdesign/views/no_sidebar.html.php deleted file mode 100644 index 378bd971..00000000 --- a/themes/stopdesign/views/no_sidebar.html.php +++ /dev/null @@ -1,6 +0,0 @@ - -
      -
    • - Add blocks", - array("url" => html::mark_clean(url::site("admin/sidebar")))) ?>
      • -
    diff --git a/themes/stopdesign/views/page.html.php b/themes/stopdesign/views/page.html.php deleted file mode 100644 index e7703272..00000000 --- a/themes/stopdesign/views/page.html.php +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - <? if ($page_title): ?> - <?= $page_title ?> - <? else: ?> - <? if ($theme->item()): ?> - <? if ($theme->item()->is_album()): ?> - <?= t("Browse Album :: %album_title", array("album_title" => $theme->item()->title)) ?> - <? elseif ($theme->item()->is_photo()): ?> - <?= t("Photo :: %photo_title", array("photo_title" => $theme->item()->title)) ?> - <? else: ?> - <?= t("Movie :: %movie_title", array("movie_title" => $theme->item()->title)) ?> - <? endif ?> - <? elseif ($theme->tag()): ?> - <?= t("Browse Tag :: %tag_title", array("tag_title" => $theme->tag()->name)) ?> - <? else: /* Not an item, not a tag, no page_title specified. Help! */ ?> - <?= t("Gallery") ?> - <? endif ?> - <? endif ?> - - " type="image/x-icon" /> - - css("_DISABLED_yui/reset-fonts-grids.css") ?> - css("_DISABLED_superfish/css/superfish.css") ?> - css("_DISABLED_themeroller/ui.base.css") ?> - css("_DISABLED_gallery.common.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("ui.init.js") ?> - - head() they get combined */ ?> - page_subtype == "photo"): ?> - script("jquery.scrollTo.js") ?> - script("gallery.show_full_size.js") ?> - page_subtype == "movie"): ?> - script("flowplayer.js") ?> - - - css("photos.css") ?> - css("aus04.css") ?> - css("custom.css") ?> - css("custom.gallery3.css") ?> - css("custom.gallery3-dialog.css") ?> - script("_DISABLED_rememberMe.js") ?> - script("_DISABLED_comments.js") ?> - script("stopdesign.ui.init.js") ?> - - head() ?> - - - -
    - -
    - - item() && !empty($parents)): ?> -

    - - - item()->id}" : null) ?>"> - title) ?> - » - - - item()->title) ?> -

    - - - - - diff --git a/themes/stopdesign/views/photo.html.php b/themes/stopdesign/views/photo.html.php deleted file mode 100644 index fb3d99de..00000000 --- a/themes/stopdesign/views/photo.html.php +++ /dev/null @@ -1,49 +0,0 @@ - - -
    -
    -

    title) ?>

    -

    description)) ?>

    -
    - -
    -

    resize_img(array()) ?>

    -
    - - - -
    - -
    - - - - - - - -
    -
    - - photo_bottom() ?> diff --git a/themes/three_nids/helpers/three_nids.php b/themes/three_nids/helpers/three_nids.php index 65054bfc..36eeb798 100644 --- a/themes/three_nids/helpers/three_nids.php +++ b/themes/three_nids/helpers/three_nids.php @@ -19,7 +19,7 @@ */ class three_nids_Core { - public function fancylink($item, $view_type="album", $group_img = true, + static function fancylink($item, $view_type="album", $group_img = true, $display_comment = true, $parent_title_class = "h2") { // view_type = album || dynamic || header $link = ""; @@ -112,7 +112,7 @@ class three_nids_Core { return $link; } - public function comment_count($item) { + static function comment_count($item) { access::required("view", $item); return ORM::factory("comment") diff --git a/themes/three_nids/views/page.html.php b/themes/three_nids/views/page.html.php index 8a39fbc4..ffad767f 100644 --- a/themes/three_nids/views/page.html.php +++ b/themes/three_nids/views/page.html.php @@ -98,7 +98,7 @@
    admin): ?> - site_menu() ?> + site_menu("#g-item-img") ?>
    header_bottom() ?>