From 0fc96621d55e1e6b3b5f7f84760a39ff06f0e641 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Wed, 5 Aug 2009 22:32:41 -0700 Subject: Don't show the ajaxy login link in the top right corner if we're on the login page itself. --- modules/user/helpers/user_theme.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/user/helpers/user_theme.php b/modules/user/helpers/user_theme.php index 69042aed..8de2d248 100644 --- a/modules/user/helpers/user_theme.php +++ b/modules/user/helpers/user_theme.php @@ -19,8 +19,10 @@ */ class user_theme_Core { static function header_top($theme) { - $view = new View("login.html"); - $view->user = user::active(); - return $view->render(); + if ($theme->page_type != "login") { + $view = new View("login.html"); + $view->user = user::active(); + return $view->render(); + } } } -- cgit v1.2.3 From 93c0dffab3ba3631c9ebf4693571bd38e5613d1c Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Thu, 6 Aug 2009 09:46:39 -0700 Subject: Remove the complicated calculation to determine the height of the micro thumb grid, by setting all the parent elements to 100% in the css and then subtract the height of the button bar --- modules/organize/css/organize.css | 11 +++++++++- modules/organize/js/organize.js | 43 ++++++++++++++++----------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css index 0a23a6bf..56ecc309 100644 --- a/modules/organize/css/organize.css +++ b/modules/organize/css/organize.css @@ -7,6 +7,11 @@ #gOrganize { overflow: hidden; + height: 100%; +} + +#gOrganize #bd { + height: 100%; } #gOrganize .yui-u { @@ -22,16 +27,20 @@ width: 75%; } +#gOrganizeDetail { + height: 100%; +} + #gMessage .gInfo { font-weight: bold; padding-left: 2em; } - /******************************************************************* * Album Tree styling */ #gOrganizeTreeContainer { + height: 100%; overflow: auto; margin: 0 !important; padding: 0 !important; diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js index 89549954..6a65bfa2 100644 --- a/modules/organize/js/organize.js +++ b/modules/organize/js/organize.js @@ -1,54 +1,45 @@ (function($) { - $.fn.organize = function(options) { + $.fn.organize = function() { var size = $.getViewportSize(); var height = size.height() - 100; // Leave 50 pixels on the top and bottom of the dialog var width = size.width() - 100; // Leave 50 pixels on the left and right of the dialog - var opts = $.extend({}, $.fn.organize.defaults, {width: width, height: height}, options); return this.each(function() { $(this).click(function(event) { var href = event.target.href; - var size = $.getViewportSize(); $("body").append('
'); - $("#gOrganizeDialog").dialog(opts); + $("#gOrganizeDialog").dialog({ + autoOpen: false, + modal: true, + resizable: false, + width: width, + height: height, + position: "center", + close: function () { + $("#gOrganizeDialog").trigger("organize_close"); + $("#gOrganizeDialog").dialog("destroy").remove(); + }, + zIndex: 75 + }); $.get(href, _init); return false; }); }); }; - $.fn.organize.defaults = { - autoOpen: false, - modal: true, - resizable: false, - minWidth: 600, - minHeight: 500, - position: "center", - close: function () { - $("#gOrganizeDialog").trigger("organize_close"); - $("#gOrganizeDialog").dialog("destroy").remove(); - }, - zIndex: 75 - }; - /** * Dynamically initialize the organize dialog when it is displayed */ function _init(data) { - // Deal with ui.jquery bug: http://dev.jqueryui.com/ticket/4475 + // Deal with ui.jquery bug: http://dev.jqueryui.com/ticket/4475 (target 1.8?) $(".sf-menu li.sfHover ul").css("z-index", 70); $("#gOrganizeDialog").html(data); $("#gOrganizeDialog").dialog("open"); - var heightMicroThumbPanel = $("#gOrganizeDialog").innerHeight(); - heightMicroThumbPanel -= 2 * parseFloat($("#gOrganizeDialog").css("padding-bottom")); - heightMicroThumbPanel = Math.floor(heightMicroThumbPanel - 10 - $("#gMessage").outerHeight()); - $("#gOrganizeTreeContainer").height(heightMicroThumbPanel); - - heightMicroThumbPanel -= $("#gOrganizeEditDrawerHandle").outerHeight(); - $("#gMicroThumbPanel").height(heightMicroThumbPanel); + var height = $("#gOrganizeDetail").innerHeight(); + $("#gMicroThumbPanel").height(height - $("#gOrganizeEditDrawerHandle").outerHeight()); if ($("#gOrganizeDialog h1").length) { $("#gOrganizeDialog").dialog('option', 'title', $("#gOrganizeDialog h1:eq(0)").html()); -- cgit v1.2.3 From 362b4d70f72fa6baed15bd323a2ca5deea7d6ab3 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Thu, 6 Aug 2009 10:03:38 -0700 Subject: Remove 6 more lines by removing the generalization of the close dialog processing --- modules/organize/js/organize.js | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js index 6a65bfa2..3e58f3f3 100644 --- a/modules/organize/js/organize.js +++ b/modules/organize/js/organize.js @@ -17,9 +17,9 @@ height: height, position: "center", close: function () { - $("#gOrganizeDialog").trigger("organize_close"); $("#gOrganizeDialog").dialog("destroy").remove(); - }, + document.location.reload(); + }, zIndex: 75 }); $.get(href, _init); @@ -47,20 +47,14 @@ $("#gOrganizeDialog").dialog('option', 'title', $("#gOrganizeDialog fieldset legend:eq(0)").html()); } - $("#gOrganizeDialog #gMicroThumbDone").click(_dialog_close); - $("#gOrganizeDialog").bind("organize_close", function(target) { - document.location.reload(); + $("#gOrganizeDialog #gMicroThumbDone").click(function(event) { + $("#gOrganizeDialog").dialog("close"); }); $(".gBranchText span").click(_collapse_or_expanded_tree); $(".gBranchText").click(_setContents); }; - function _dialog_close(event) { - event.preventDefault(); - $("#gOrganizeDialog").dialog("close"); - }; - /** * Open or close a branch. If the children is a div placeholder, replace with
    */ -- cgit v1.2.3