Peter M. Groen / knowledgetree

Commit 2b214a26d89d4a1ee2fd9fea281cfa16fc7e4c04

Authored by Jalaloedien Abrahams
1 parent ce247208

KTS-2017 

"Dashlets load too slow with new UI improvements. "
Fixed.

Reviewed By: Kevin

KTS-2018
"Dashlet contents overflow the dashlet. "
Fixed.

Reviewed By: Kevin

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6683 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 4 changed files with 48 additions and 32 deletions
resources/css/kt-framing.css
  View file @2b214a2
... ... @@ -50,6 +50,7 @@ body
50 50 border: 1px solid #BBBBBB;
51 51 padding: 20px;
52 52 min-height: 800px;
  53 + min-width: 600px;
53 54 height: auto;
54 55 background-image: url(../../resources/graphics/page_bg.png);
55 56 background-repeat: repeat-x;
... ... @@ -61,6 +62,9 @@ body
61 62 margin-right:15px;
62 63 }
63 64  
  65 +#wrapper {
  66 + min-width: 750px;
  67 +}
64 68 /* ------------------ logobar ------------------ */
65 69  
66 70 #logobar
... ... @@ -1278,11 +1282,12 @@ hr {
1278 1282 .ktBlock .dashboard_block_body
1279 1283 {
1280 1284 z-index:99;
1281   - margin: 8px 0 10px 0;
  1285 + margin: 8px 5px 10px 5px;
1282 1286 background-color:#FFFFFF;
1283 1287 padding-left: 15px;
1284 1288 padding-right: 15px;
1285 1289 padding-bottom: 5px;
  1290 + overflow: auto;
1286 1291 }
1287 1292  
1288 1293 .ktError .dashboard_block_body
... ... @@ -1290,6 +1295,7 @@ hr {
1290 1295 z-index:99;
1291 1296 margin-top: -8px;
1292 1297 background-color: #ffdd80;
  1298 + overflow: auto;
1293 1299 }
1294 1300  
1295 1301 .ktInfo .dashboard_block_body
... ... @@ -1297,6 +1303,7 @@ hr {
1297 1303 z-index:99;
1298 1304 margin-top: -8px;
1299 1305 background-color: #DEDEDE;
  1306 + overflow: auto;
1300 1307 }
1301 1308  
1302 1309 .dashboard_block .dashboard_block_body .edit_action
... ...
resources/js/loader.js
  View file @2b214a2
... ... @@ -26,64 +26,64 @@ window.onload = function()
26 26 pageBody.style.backgroundPosition="bottom left";
27 27  
28 28 // footer
29   - var copyrightBar = document.getElementById("copyrightbarBorder");
30   - var footerBlock = new curvyCorners(settings, copyrightBar);
  29 + var footer = document.getElementById("copyrightbarBorder");
  30 + var footerBlock = new curvyCorners(settings, footer);
31 31 footerBlock.applyCornersToAll();
32 32  
33 33 // standard dashlets
  34 + var dashBlock = new curvyCorners(settings_dashlets, "ktBlock");
  35 + dashBlock.applyCornersToAll();
34 36 var dashboardBlocks = getElementsByClass("ktBlock");
35 37 for(var t = 0; t < dashboardBlocks.length; t++){
36   - var dashBlock = new curvyCorners(settings_dashlets, dashboardBlocks[t]);
37   - dashBlock.applyCornersToAll();
38 38 dashboardBlocks[t].style.margin="0 0 26px 0";
39 39 }
40 40  
41 41 //info dashlets
  42 + var infoBlock = new curvyCorners(settings_dashlets, "ktInfo");
  43 + infoBlock.applyCornersToAll();
42 44 var infodashlets = getElementsByClass("ktInfo");
43 45 for(var q = 0; q < infodashlets.length; q++){
44   - var infoBlock = new curvyCorners(settings_dashlets, infodashlets[q]);
45   - infoBlock.applyCornersToAll();
46 46 infodashlets[q].style.margin="0 0 26px 0";
47 47 }
48 48  
49 49 //info message popups
  50 + var infoMessage = new curvyCorners(settings_dashlets, "ktInfoMessage");
  51 + infoMessage.applyCornersToAll();
50 52 var infoMessages = getElementsByClass("ktInfoMessage");
51 53 for(var s = 0; s < infoMessages.length; s++){
52   - var infoMessage = new curvyCorners(settings_dashlets, infoMessages[s]);
53   - infoMessage.applyCornersToAll();
54 54 infoMessages[s].style.margin="0 0 26px 0";
55 55 }
56 56  
57 57 //error message dashlets
  58 + var errorBlock = new curvyCorners(settings_dashlets, "ktError");
  59 + errorBlock.applyCornersToAll();
58 60 var errordashlets = getElementsByClass("ktError");
59 61 for(var r = 0; r < errordashlets.length; r++){
60   - var errorBlock = new curvyCorners(settings_dashlets, errordashlets[r]);
61   - errorBlock.applyCornersToAll();
62 62 errordashlets[r].style.margin="0 0 26px 0";
63 63 }
64 64  
65 65 //error message popups
  66 + var errorMessage = new curvyCorners(settings_dashlets, "ktErrorMessage");
  67 + errorMessage.applyCornersToAll();
66 68 var errorMessages = getElementsByClass("ktErrorMessage");
67 69 for(var v = 0; v < errorMessages.length; v++){
68   - var errorMessage = new curvyCorners(settings_dashlets, errorMessages[v]);
69   - errorMessage.applyCornersToAll();
70 70 errorMessages[v].style.margin="0 0 26px 0";
71 71 }
72 72  
73 73 if(getElementsByClass("noportlets").length != '1'){
74 74 //portlets
  75 + var portletBlock = new curvyCorners(settings_dashlets, "portlet");
  76 + portletBlock.applyCornersToAll();
75 77 var portlets = getElementsByClass("portlet");
76 78 for(var t = 0; t < portlets.length; t++){
77   - var portletBlock = new curvyCorners(settings_dashlets, portlets[t]);
78   - portletBlock.applyCornersToAll();
79 79 portlets[t].style.margin="0 0 26px 0";
80 80 }
81 81  
82 82 //portlets
  83 + var exp_portletBlock = new curvyCorners(settings_dashlets, "portlet expanded");
  84 + exp_portletBlock.applyCornersToAll();
83 85 var exp_portlets = getElementsByClass("portlet expanded");
84 86 for(var u = 0; u < exp_portlets.length; u++){
85   - var exp_portletBlock = new curvyCorners(settings_dashlets, exp_portlets[u]);
86   - exp_portletBlock.applyCornersToAll();
87 87 exp_portlets[u].style.margin="0 0 26px 0";
88 88 }
89 89 }
... ...
templates/kt3/standard_page.smarty
  View file @2b214a2
... ... @@ -61,6 +61,7 @@
61 61 <![endif]-->
62 62 </head>
63 63 <body {if (!$page->show_portlets)}class="noportlets"{/if}>
  64 +<div id="wrapper">
64 65 <input type="hidden" name="kt-core-baseurl" id="kt-core-baseurl" value="{$rootUrl}" />
65 66 <div id="pageBody">
66 67 <div id="bodyPad">
... ... @@ -215,6 +216,7 @@
215 216 </tr>
216 217 </table>
217 218 <div class="floatClear"></div>
218   - </div>
  219 + </div>
  220 +</div>
219 221 </body>
220 222 </html>
... ...
thirdpartyjs/curvycorners/rounded_corners.inc.js
  View file @2b214a2
... ... @@ -34,12 +34,12 @@
34 34 * MA 02111-1307 USA *
35 35 * *
36 36 ****************************************************************/
37   -var mycount=0;
38   -var myobj='';
  37 +
39 38 // Browser detection
40 39 var isIE = navigator.userAgent.toLowerCase().indexOf("msie") > -1;
41 40 var isMoz = document.implementation && document.implementation.createDocument;
42 41 var isSafari = ((navigator.userAgent.toLowerCase().indexOf('safari')!=-1)&&(navigator.userAgent.toLowerCase().indexOf('mac')!=-1))?true:false;
  42 + var masterCorners = new Array();
43 43  
44 44 /*
45 45 Usage:
... ... @@ -90,7 +90,7 @@ var myobj=&#39;&#39;;
90 90  
91 91 this.objects = curvyCornersCol;
92 92  
93   - // Applys the curvyCorners to all objects
  93 + // Applies the curvyCorners to all objects
94 94 this.applyCornersToAll = function()
95 95 {
96 96 for(var x = 0, k = this.objects.length; x < k; x++)
... ... @@ -108,7 +108,7 @@ var myobj=&#39;&#39;;
108 108 this.settings = arguments[0];
109 109 this.topContainer = null;
110 110 this.bottomContainer = null;
111   - this.masterCorners = new Array();
  111 +
112 112 this.contentDIV = null;
113 113  
114 114 // Get box formatting details
... ... @@ -295,15 +295,22 @@ var myobj=&#39;&#39;;
295 295 The pixel bars will then be repositioned to form the new corner type.
296 296 All new corners start as a bottom right corner.
297 297 */
298   - //if(this.masterCorners[this.settings[cc].radius])
299   - //{
300   - // Create clone of the master corner
301   - //if(){
302   - //var newCorner = this.masterCorners[this.settings[cc].radius].cloneNode(true);
303   - //}
304   - //}
305   - //else
306   - {
  298 + //alert(masterCorners["boxId: "+ cc]+ cc);
  299 + /*if(cc == "tr"){
  300 + if(masterCorners[this.settings[cc].radius])
  301 + var newCorner = masterCorners[this.settings["tr"].radius].cloneNode(true);
  302 + //alert("cloning tr");
  303 + }else if(cc == "br"){
  304 + if(masterCorners[this.settings[cc].radius])
  305 + var newCorner = masterCorners[this.settings["br"].radius].cloneNode(true);
  306 + //alert("cloning br");
  307 + }*/
  308 +
  309 + if(masterCorners[this.settings[cc].radius] && cc == "tl"){
  310 + var newCorner = masterCorners[this.settings["tr"].radius].cloneNode(true);
  311 + }else if(masterCorners[this.settings[cc].radius] && cc == "bl"){
  312 + var newCorner = masterCorners[this.settings["br"].radius].cloneNode(true);
  313 + }else{
307 314 // Yes, we need to create a new corner
308 315 var newCorner = document.createElement("DIV");
309 316 newCorner.style.height = this.settings[cc].radius + "px";
... ... @@ -422,7 +429,7 @@ var myobj=&#39;&#39;;
422 429 // ---------------------------------------------------- END
423 430  
424 431 // We now need to store the current corner in the masterConers array
425   - this.masterCorners[this.settings[cc].radius] = newCorner.cloneNode(true);
  432 + masterCorners[this.settings[cc].radius] = newCorner.cloneNode(true);
426 433 }
427 434  
428 435 /*
... ...