diff --git a/resources/css/kt-framing.css b/resources/css/kt-framing.css index 972879a..b65bac6 100644 --- a/resources/css/kt-framing.css +++ b/resources/css/kt-framing.css @@ -50,6 +50,7 @@ body border: 1px solid #BBBBBB; padding: 20px; min-height: 800px; + min-width: 600px; height: auto; background-image: url(../../resources/graphics/page_bg.png); background-repeat: repeat-x; @@ -61,6 +62,9 @@ body margin-right:15px; } +#wrapper { + min-width: 750px; +} /* ------------------ logobar ------------------ */ #logobar @@ -1278,11 +1282,12 @@ hr { .ktBlock .dashboard_block_body { z-index:99; - margin: 8px 0 10px 0; + margin: 8px 5px 10px 5px; background-color:#FFFFFF; padding-left: 15px; padding-right: 15px; padding-bottom: 5px; + overflow: auto; } .ktError .dashboard_block_body @@ -1290,6 +1295,7 @@ hr { z-index:99; margin-top: -8px; background-color: #ffdd80; + overflow: auto; } .ktInfo .dashboard_block_body @@ -1297,6 +1303,7 @@ hr { z-index:99; margin-top: -8px; background-color: #DEDEDE; + overflow: auto; } .dashboard_block .dashboard_block_body .edit_action diff --git a/resources/js/loader.js b/resources/js/loader.js index ef1a8b9..c152eb8 100644 --- a/resources/js/loader.js +++ b/resources/js/loader.js @@ -26,64 +26,64 @@ window.onload = function() pageBody.style.backgroundPosition="bottom left"; // footer - var copyrightBar = document.getElementById("copyrightbarBorder"); - var footerBlock = new curvyCorners(settings, copyrightBar); + var footer = document.getElementById("copyrightbarBorder"); + var footerBlock = new curvyCorners(settings, footer); footerBlock.applyCornersToAll(); // standard dashlets + var dashBlock = new curvyCorners(settings_dashlets, "ktBlock"); + dashBlock.applyCornersToAll(); var dashboardBlocks = getElementsByClass("ktBlock"); for(var t = 0; t < dashboardBlocks.length; t++){ - var dashBlock = new curvyCorners(settings_dashlets, dashboardBlocks[t]); - dashBlock.applyCornersToAll(); dashboardBlocks[t].style.margin="0 0 26px 0"; } //info dashlets + var infoBlock = new curvyCorners(settings_dashlets, "ktInfo"); + infoBlock.applyCornersToAll(); var infodashlets = getElementsByClass("ktInfo"); for(var q = 0; q < infodashlets.length; q++){ - var infoBlock = new curvyCorners(settings_dashlets, infodashlets[q]); - infoBlock.applyCornersToAll(); infodashlets[q].style.margin="0 0 26px 0"; } //info message popups + var infoMessage = new curvyCorners(settings_dashlets, "ktInfoMessage"); + infoMessage.applyCornersToAll(); var infoMessages = getElementsByClass("ktInfoMessage"); for(var s = 0; s < infoMessages.length; s++){ - var infoMessage = new curvyCorners(settings_dashlets, infoMessages[s]); - infoMessage.applyCornersToAll(); infoMessages[s].style.margin="0 0 26px 0"; } //error message dashlets + var errorBlock = new curvyCorners(settings_dashlets, "ktError"); + errorBlock.applyCornersToAll(); var errordashlets = getElementsByClass("ktError"); for(var r = 0; r < errordashlets.length; r++){ - var errorBlock = new curvyCorners(settings_dashlets, errordashlets[r]); - errorBlock.applyCornersToAll(); errordashlets[r].style.margin="0 0 26px 0"; } //error message popups + var errorMessage = new curvyCorners(settings_dashlets, "ktErrorMessage"); + errorMessage.applyCornersToAll(); var errorMessages = getElementsByClass("ktErrorMessage"); for(var v = 0; v < errorMessages.length; v++){ - var errorMessage = new curvyCorners(settings_dashlets, errorMessages[v]); - errorMessage.applyCornersToAll(); errorMessages[v].style.margin="0 0 26px 0"; } if(getElementsByClass("noportlets").length != '1'){ //portlets + var portletBlock = new curvyCorners(settings_dashlets, "portlet"); + portletBlock.applyCornersToAll(); var portlets = getElementsByClass("portlet"); for(var t = 0; t < portlets.length; t++){ - var portletBlock = new curvyCorners(settings_dashlets, portlets[t]); - portletBlock.applyCornersToAll(); portlets[t].style.margin="0 0 26px 0"; } //portlets + var exp_portletBlock = new curvyCorners(settings_dashlets, "portlet expanded"); + exp_portletBlock.applyCornersToAll(); var exp_portlets = getElementsByClass("portlet expanded"); for(var u = 0; u < exp_portlets.length; u++){ - var exp_portletBlock = new curvyCorners(settings_dashlets, exp_portlets[u]); - exp_portletBlock.applyCornersToAll(); exp_portlets[u].style.margin="0 0 26px 0"; } } diff --git a/templates/kt3/standard_page.smarty b/templates/kt3/standard_page.smarty index 7c0a2f8..e9ace3c 100644 --- a/templates/kt3/standard_page.smarty +++ b/templates/kt3/standard_page.smarty @@ -61,6 +61,7 @@ show_portlets)}class="noportlets"{/if}> +
@@ -215,6 +216,7 @@
-
+
+
diff --git a/thirdpartyjs/curvycorners/rounded_corners.inc.js b/thirdpartyjs/curvycorners/rounded_corners.inc.js index 4d6e131..db644c8 100644 --- a/thirdpartyjs/curvycorners/rounded_corners.inc.js +++ b/thirdpartyjs/curvycorners/rounded_corners.inc.js @@ -34,12 +34,12 @@ * MA 02111-1307 USA * * * ****************************************************************/ -var mycount=0; -var myobj=''; + // Browser detection var isIE = navigator.userAgent.toLowerCase().indexOf("msie") > -1; var isMoz = document.implementation && document.implementation.createDocument; var isSafari = ((navigator.userAgent.toLowerCase().indexOf('safari')!=-1)&&(navigator.userAgent.toLowerCase().indexOf('mac')!=-1))?true:false; + var masterCorners = new Array(); /* Usage: @@ -90,7 +90,7 @@ var myobj=''; this.objects = curvyCornersCol; - // Applys the curvyCorners to all objects + // Applies the curvyCorners to all objects this.applyCornersToAll = function() { for(var x = 0, k = this.objects.length; x < k; x++) @@ -108,7 +108,7 @@ var myobj=''; this.settings = arguments[0]; this.topContainer = null; this.bottomContainer = null; - this.masterCorners = new Array(); + this.contentDIV = null; // Get box formatting details @@ -295,15 +295,22 @@ var myobj=''; The pixel bars will then be repositioned to form the new corner type. All new corners start as a bottom right corner. */ - //if(this.masterCorners[this.settings[cc].radius]) - //{ - // Create clone of the master corner - //if(){ - //var newCorner = this.masterCorners[this.settings[cc].radius].cloneNode(true); - //} - //} - //else - { + //alert(masterCorners["boxId: "+ cc]+ cc); + /*if(cc == "tr"){ + if(masterCorners[this.settings[cc].radius]) + var newCorner = masterCorners[this.settings["tr"].radius].cloneNode(true); + //alert("cloning tr"); + }else if(cc == "br"){ + if(masterCorners[this.settings[cc].radius]) + var newCorner = masterCorners[this.settings["br"].radius].cloneNode(true); + //alert("cloning br"); + }*/ + + if(masterCorners[this.settings[cc].radius] && cc == "tl"){ + var newCorner = masterCorners[this.settings["tr"].radius].cloneNode(true); + }else if(masterCorners[this.settings[cc].radius] && cc == "bl"){ + var newCorner = masterCorners[this.settings["br"].radius].cloneNode(true); + }else{ // Yes, we need to create a new corner var newCorner = document.createElement("DIV"); newCorner.style.height = this.settings[cc].radius + "px"; @@ -422,7 +429,7 @@ var myobj=''; // ---------------------------------------------------- END // We now need to store the current corner in the masterConers array - this.masterCorners[this.settings[cc].radius] = newCorner.cloneNode(true); + masterCorners[this.settings[cc].radius] = newCorner.cloneNode(true); } /*