From 2e420522ece22942a9b3b6ee413ca0e1dfa76148 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Wed, 25 Nov 2009 13:22:24 -0800 Subject: Preliminary work to cut over to Kohana 2.4 - Kohana::log() -> Kohana_Log::add() - Kohana::config_XXX -> Kohana_Config::instance()->XXX - Implement View::set_global in MY_View - Updated Cache_Database_Driver to latest APIs - ORM::$loaded -> ORM::loaded() - Updated item::viewable() to use K2.4 parenthesization --- modules/gallery/views/kohana_error_page.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/gallery/views') diff --git a/modules/gallery/views/kohana_error_page.php b/modules/gallery/views/kohana_error_page.php index 0d8801e5..b9fdcc19 100644 --- a/modules/gallery/views/kohana_error_page.php +++ b/modules/gallery/views/kohana_error_page.php @@ -120,7 +120,7 @@ getTraceAsString(); ?> - + -- cgit v1.2.3 From 29f982679d775dc981544b06da64970dee9e6e47 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Wed, 23 Dec 2009 20:36:38 -0800 Subject: First shot at integrating the K24 error page. --- modules/gallery/views/kohana/error.php | 257 +++++++++++++++++++++++++++++++++ 1 file changed, 257 insertions(+) create mode 100644 modules/gallery/views/kohana/error.php (limited to 'modules/gallery/views') diff --git a/modules/gallery/views/kohana/error.php b/modules/gallery/views/kohana/error.php new file mode 100644 index 00000000..f973f5b9 --- /dev/null +++ b/modules/gallery/views/kohana/error.php @@ -0,0 +1,257 @@ + + + + + + + <?= t("Something went wrong!") ?> + + + + + + admin ?> +
+

+ +

+

+ +

+ +

+ +

+ +
+ +
+

+ +

+
+

+ + [ ]: + + + + +

+
+
+

+ + [ ] + +

+ + $row): ?>"> + +
+ + +
    + $step): ?> +
  1. +

    + + + + [ ] + + [ ] + + + {} + + + » + ( + + ) +

    + + + + + + +
    2. + + +
+ + +
+

+ " onclick="return koggle('')"> +

+ +
+
+ + + -- cgit v1.2.3 From b62083bd24b7e5fa079726dc0819fb646c31192b Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Wed, 23 Dec 2009 20:48:50 -0800 Subject: Cleaner version. Probably has a bunch of cruft in it, but it looks good enough. --- modules/gallery/views/kohana/error.php | 78 ++++++++++++++++++++++------------ 1 file changed, 50 insertions(+), 28 deletions(-) (limited to 'modules/gallery/views') diff --git a/modules/gallery/views/kohana/error.php b/modules/gallery/views/kohana/error.php index f973f5b9..7c4a959c 100644 --- a/modules/gallery/views/kohana/error.php +++ b/modules/gallery/views/kohana/error.php @@ -72,8 +72,34 @@ padding-bottom: 10px; } - #first_error { - padding-left: 20px; + .source { + border: solid 1px #ccc; + background: #efe; + margin-bottom: 5px; + } + + table { + width: 100%; + display: block; + margin: 0 0 0.4em; + padding: 0; + border-collapse: collapse; + background: #efe; + } + + table td { + border: solid 1px #ddd; + text-align: left; + vertical-align: top; + padding: 0.4em; + } + + .args table td.key { + width: 200px; + } + + .number { + padding-right: 1em; } @@ -134,21 +160,23 @@
-
-

- - [ ] - -

+
    +
  1. +

    + + [ ] + +

    - $row): ?>"> - -
+
+ $row): ?>"> + +
+ - -
    + $step): ?> -
  1. +

  2. @@ -171,12 +199,10 @@ $arg): ?> - - @@ -185,7 +211,7 @@ - + @@ -205,9 +231,7 @@ @@ -220,9 +244,7 @@ @@ -236,12 +258,12 @@
    - - - + +
    		+
    - - - +
    - - - +
    $value): ?> - - -- cgit v1.2.3 From 754c531c7ec77278e44669ee5a854dd4653120f8 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sun, 27 Dec 2009 13:37:39 -0800 Subject: Only mark a variable as empty if its value is null. So 0 shows as 0. --- modules/gallery/views/admin_advanced_settings.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/gallery/views') diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php index ff4843ab..2d4b11a1 100644 --- a/modules/gallery/views/admin_advanced_settings.html.php +++ b/modules/gallery/views/admin_advanced_settings.html.php @@ -25,7 +25,7 @@ module_name/" . html::clean($var->name)) ?>" class="g-dialog-link" title=" $var->name, "module_name" => $var->module_name))->for_html_attr() ?>"> - value): ?> + value)): ?> value) ?> -- cgit v1.2.3 From 399c5c21f6da5dc02e55be6d5b453b43ae4cf158 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Wed, 30 Dec 2009 11:47:34 -0800 Subject: Force the 'Select Photos...' button to always be in the center of the upload dialog with the flash object overtop of it. Fixes ticket: #908. --- modules/gallery/views/form_uploadify.html.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'modules/gallery/views') diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php index d856c464..43b73033 100644 --- a/modules/gallery/views/form_uploadify.html.php +++ b/modules/gallery/views/form_uploadify.html.php @@ -1,15 +1,19 @@ @@ -23,7 +27,6 @@ fileExt: "*.gif;*.jpg;*.jpeg;*.png;*.flv;*.mp4;*.GIF;*.JPG;*.JPEG;*.PNG;*.FLV;*.MP4", fileDesc: for_js() ?>, cancelImg: "", - buttonText: for_js() ?>, simUploadLimit: , wmode: "transparent", hideButton: true, /* should be true */ @@ -77,7 +80,6 @@ $("#g-add-photos-status ul").append( "
  3. " + fileObj.name + msg + "
    4. "); $("#g-uploadify" + queueID).remove(); - //return false; }, onSelect: function(event) { if ($("#g-upload-cancel-all").hasClass("ui-state-disabled")) { @@ -114,7 +116,7 @@
    - +
    -- cgit v1.2.3 From 1b3d20a0fbb114423bf52ef8fc8b7c7aae150391 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Sat, 2 Jan 2010 08:42:06 -0800 Subject: Correct formatting in the uploadify dialog box for safari. --- modules/gallery/views/form_uploadify.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/gallery/views') diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php index 43b73033..f3b9c883 100644 --- a/modules/gallery/views/form_uploadify.html.php +++ b/modules/gallery/views/form_uploadify.html.php @@ -115,7 +115,7 @@
    -
    +
    -- cgit v1.2.3 From 681613ac9e1fb21cab93033cf08b0e02b673e1b8 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 2 Jan 2010 14:52:10 -0800 Subject: Fix up tabs, leading + @@ -151,15 +151,15 @@
    -

    +

    [ ]: -

    -
    + +

    1. @@ -219,11 +219,11 @@

    -
    -

    +

    +

    " onclick="return koggle('')">

    -
    + +

- + -- cgit v1.2.3