Commit 15a70c54c7ad2bbbfb36a9c8b380de1e7238fb6c
1 parent
c8f54f9f
KTS-2153
"CLONE(SUP-299) -Super sluggish web interface after upgrade to 3.4a" In Progress. Reverted all dashlets and portlets to old css rules. Committed By: Jalaloedien Abrahams Reviewed By: Kevin Fourie git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6888 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
2 changed files
with
143 additions
and
35 deletions
templates/kt3/dashboard.smarty
| 1 | <div id="dashboard-container-left"> | 1 | <div id="dashboard-container-left"> |
| 2 | {foreach item=oDashlet from=$dashlets_left} | 2 | {foreach item=oDashlet from=$dashlets_left} |
| 3 | <div class="dashboard_block" id="{$context->_getDashletId($oDashlet)}"> | 3 | <div class="dashboard_block" id="{$context->_getDashletId($oDashlet)}"> |
| 4 | - <div class="{$oDashlet->sClass}" id="{$oDashlet->sClass}"> | ||
| 5 | - | 4 | + <div class="{$oDashlet->sClass}"> |
| 5 | + {if $oDashlet->sClass === "ktBlock"} | ||
| 6 | + <div class="dashboard_block_rightrepeat_top"></div> | ||
| 7 | + <div class="dashboard_block_rightrepeat_bottom"></div> | ||
| 8 | + <div class="dashboard_block_leftrepeat_top"></div> | ||
| 9 | + <div class="dashboard_block_leftrepeat_bottom"></div> | ||
| 10 | + {/if} | ||
| 11 | + | ||
| 12 | + {if $oDashlet->sClass === "ktError"} | ||
| 13 | + <div class="error_dashlet_rightrepeat_top"></div> | ||
| 14 | + <div class="error_dashlet_rightrepeat_bottom"></div> | ||
| 15 | + <div class="error_dashlet_leftrepeat_top"></div> | ||
| 16 | + <div class="error_dashlet_leftrepeat_bottom"></div> | ||
| 17 | + {/if} | ||
| 18 | + | ||
| 19 | + {if $oDashlet->sClass === "ktInfo"} | ||
| 20 | + <div class="info_dashlet_rightrepeat_top"></div> | ||
| 21 | + <div class="info_dashlet_rightrepeat_bottom"></div> | ||
| 22 | + <div class="info_dashlet_leftrepeat_top"></div> | ||
| 23 | + <div class="info_dashlet_leftrepeat_bottom"></div> | ||
| 24 | + {/if} | ||
| 6 | <div class="dashboard_block_icons"> | 25 | <div class="dashboard_block_icons"> |
| 7 | <a href="#" class="action action_rollup"> </a> | 26 | <a href="#" class="action action_rollup"> </a> |
| 8 | <a href="#" class="action action_close"> </a> | 27 | <a href="#" class="action action_close"> </a> |
| @@ -13,7 +32,33 @@ | @@ -13,7 +32,33 @@ | ||
| 13 | <div class="dashboard_block_body"> | 32 | <div class="dashboard_block_body"> |
| 14 | {$oDashlet->render()} | 33 | {$oDashlet->render()} |
| 15 | </div> | 34 | </div> |
| 16 | - | 35 | + {if $oDashlet->sClass === "ktBlock"} |
| 36 | + <div class="dashboard_block_topleft"></div> | ||
| 37 | + <div class="dashboard_block_toprepeat"></div> | ||
| 38 | + <div class="dashboard_block_topright"></div> | ||
| 39 | + | ||
| 40 | + <div class="dashboard_block_bottomleft"></div> | ||
| 41 | + <div class="dashboard_block_bottomrepeat"></div> | ||
| 42 | + <div class="dashboard_block_bottomright"></div> | ||
| 43 | + {/if} | ||
| 44 | + {if $oDashlet->sClass === "ktError"} | ||
| 45 | + <div class="error_dashlet_topleft"></div> | ||
| 46 | + <div class="error_dashlet_toprepeat"></div> | ||
| 47 | + <div class="error_dashlet_topright"></div> | ||
| 48 | + | ||
| 49 | + <div class="error_dashlet_bottomleft"></div> | ||
| 50 | + <div class="error_dashlet_bottomrepeat"></div> | ||
| 51 | + <div class="error_dashlet_bottomright"></div> | ||
| 52 | + {/if} | ||
| 53 | + {if $oDashlet->sClass === "ktInfo"} | ||
| 54 | + <div class="info_dashlet_topleft"></div> | ||
| 55 | + <div class="info_dashlet_toprepeat"></div> | ||
| 56 | + <div class="info_dashlet_topright"></div> | ||
| 57 | + | ||
| 58 | + <div class="info_dashlet_bottomleft"></div> | ||
| 59 | + <div class="info_dashlet_bottomrepeat"></div> | ||
| 60 | + <div class="info_dashlet_bottomright"></div> | ||
| 61 | + {/if} | ||
| 17 | </div> | 62 | </div> |
| 18 | </div> | 63 | </div> |
| 19 | {/foreach} | 64 | {/foreach} |
| @@ -23,8 +68,25 @@ | @@ -23,8 +68,25 @@ | ||
| 23 | <div id="dashboard-container-right"> | 68 | <div id="dashboard-container-right"> |
| 24 | {foreach item=oDashlet from=$dashlets_right} | 69 | {foreach item=oDashlet from=$dashlets_right} |
| 25 | <div class="dashboard_block" id="{$context->_getDashletId($oDashlet)}"> | 70 | <div class="dashboard_block" id="{$context->_getDashletId($oDashlet)}"> |
| 26 | - <div class="{$oDashlet->sClass}" id="{$oDashlet->sClass}"> | ||
| 27 | - | 71 | + <div class="{$oDashlet->sClass}"> |
| 72 | + {if $oDashlet->sClass === "ktBlock"} | ||
| 73 | + <div class="dashboard_block_rightrepeat_top"></div> | ||
| 74 | + <div class="dashboard_block_rightrepeat_bottom"></div> | ||
| 75 | + <div class="dashboard_block_leftrepeat_top"></div> | ||
| 76 | + <div class="dashboard_block_leftrepeat_bottom"></div> | ||
| 77 | + {/if} | ||
| 78 | + {if $oDashlet->sClass === "ktError"} | ||
| 79 | + <div class="error_dashlet_rightrepeat_top"></div> | ||
| 80 | + <div class="error_dashlet_rightrepeat_bottom"></div> | ||
| 81 | + <div class="error_dashlet_leftrepeat_top"></div> | ||
| 82 | + <div class="error_dashlet_leftrepeat_bottom"></div> | ||
| 83 | + {/if} | ||
| 84 | + {if $oDashlet->sClass === "ktInfo"} | ||
| 85 | + <div class="info_dashlet_rightrepeat_top"></div> | ||
| 86 | + <div class="info_dashlet_rightrepeat_bottom"></div> | ||
| 87 | + <div class="info_dashlet_leftrepeat_top"></div> | ||
| 88 | + <div class="info_dashlet_leftrepeat_bottom"></div> | ||
| 89 | + {/if} | ||
| 28 | <div class="dashboard_block_icons"> | 90 | <div class="dashboard_block_icons"> |
| 29 | <a href="#" class="action action_rollup"> </a> | 91 | <a href="#" class="action action_rollup"> </a> |
| 30 | <a href="#" class="action action_close"> </a> | 92 | <a href="#" class="action action_close"> </a> |
| @@ -35,7 +97,33 @@ | @@ -35,7 +97,33 @@ | ||
| 35 | {$oDashlet->render()} | 97 | {$oDashlet->render()} |
| 36 | </div> | 98 | </div> |
| 37 | 99 | ||
| 38 | - | 100 | + {if $oDashlet->sClass === "ktBlock"} |
| 101 | + <div class="dashboard_block_topleft"></div> | ||
| 102 | + <div class="dashboard_block_toprepeat"></div> | ||
| 103 | + <div class="dashboard_block_topright"></div> | ||
| 104 | + | ||
| 105 | + <div class="dashboard_block_bottomleft"></div> | ||
| 106 | + <div class="dashboard_block_bottomrepeat"></div> | ||
| 107 | + <div class="dashboard_block_bottomright"></div> | ||
| 108 | + {/if} | ||
| 109 | + {if $oDashlet->sClass === "ktError"} | ||
| 110 | + <div class="error_dashlet_topleft"></div> | ||
| 111 | + <div class="error_dashlet_toprepeat"></div> | ||
| 112 | + <div class="error_dashlet_topright"></div> | ||
| 113 | + | ||
| 114 | + <div class="error_dashlet_bottomleft"></div> | ||
| 115 | + <div class="error_dashlet_bottomrepeat"></div> | ||
| 116 | + <div class="error_dashlet_bottomright"></div> | ||
| 117 | + {/if} | ||
| 118 | + {if $oDashlet->sClass === "ktInfo"} | ||
| 119 | + <div class="info_dashlet_topleft"></div> | ||
| 120 | + <div class="info_dashlet_toprepeat"></div> | ||
| 121 | + <div class="info_dashlet_topright"></div> | ||
| 122 | + | ||
| 123 | + <div class="info_dashlet_bottomleft"></div> | ||
| 124 | + <div class="info_dashlet_bottomrepeat"></div> | ||
| 125 | + <div class="info_dashlet_bottomright"></div> | ||
| 126 | + {/if} | ||
| 39 | </div> | 127 | </div> |
| 40 | </div> | 128 | </div> |
| 41 | {/foreach} | 129 | {/foreach} |
templates/kt3/standard_page.smarty
| 1 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" | 1 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" |
| 2 | "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> | 2 | "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> |
| 3 | -<html> | 3 | +<html> |
| 4 | <head> | 4 | <head> |
| 5 | <title>{$page->title}{if ($page->secondary_title != null)} — {$page->secondary_title}{/if} | {$page->systemName}</title> | 5 | <title>{$page->title}{if ($page->secondary_title != null)} — {$page->secondary_title}{/if} | {$page->systemName}</title> |
| 6 | 6 | ||
| @@ -152,18 +152,20 @@ | @@ -152,18 +152,20 @@ | ||
| 152 | <tr align="left" align="left"> | 152 | <tr align="left" align="left"> |
| 153 | <td valign="top"> | 153 | <td valign="top"> |
| 154 | <div id="portletbar"> | 154 | <div id="portletbar"> |
| 155 | - {foreach item=oPortlet from=$page->portlets} | ||
| 156 | - {assign var=portlet_output value=$oPortlet->render() } | ||
| 157 | - {if $portlet_output} | ||
| 158 | - <div class="portlet{if $oPortlet->getActive()} expanded{/if}" id="portlet{if $oPortlet->getActive()} expanded{/if}"> | ||
| 159 | - <h4 onclick="toggleElementClass('expanded', this.parentNode)">{$oPortlet->getTitle()}</h4> | ||
| 160 | - <div class="portletbody"> | ||
| 161 | - {$portlet_output} | ||
| 162 | - </div> | ||
| 163 | - </div> | ||
| 164 | - {/if} | ||
| 165 | - {/foreach} | ||
| 166 | - <div class="floatClear"></div> | 155 | + {foreach item=oPortlet from=$page->portlets} |
| 156 | + {assign var=portlet_output value=$oPortlet->render() } | ||
| 157 | + {if $portlet_output} | ||
| 158 | + <div class="portlet {if $oPortlet->getActive()}expanded{/if}"> | ||
| 159 | + <h4 onclick="toggleElementClass('expanded',this.parentNode)">{$oPortlet->getTitle()}</h4> | ||
| 160 | + <div class="portletTopRepeat"></div> | ||
| 161 | + <div class="portletTopRight"></div> | ||
| 162 | + <div class="portletbody"> | ||
| 163 | + {$portlet_output} | ||
| 164 | + </div> | ||
| 165 | + </div> | ||
| 166 | + {/if} | ||
| 167 | + {/foreach} | ||
| 168 | + <div class="floatClear"></div> | ||
| 167 | </div> | 169 | </div> |
| 168 | </td> | 170 | </td> |
| 169 | <td valign="top" width="100%"> | 171 | <td valign="top" width="100%"> |
| @@ -175,22 +177,40 @@ | @@ -175,22 +177,40 @@ | ||
| 175 | {/if} | 177 | {/if} |
| 176 | 178 | ||
| 177 | <!-- any status / error messages get added here. --> | 179 | <!-- any status / error messages get added here. --> |
| 178 | - {if (!empty($page->errStack))} | ||
| 179 | - <div class="ktErrorMessage"> | ||
| 180 | - {foreach item=sError from=$page->errStack} | ||
| 181 | - <span>{$sError}</span> | ||
| 182 | - {/foreach} | ||
| 183 | - </div> | ||
| 184 | - {/if} | ||
| 185 | - | ||
| 186 | - {if (!empty($page->infoStack))} | ||
| 187 | - <div class="ktInfoMessage"> | ||
| 188 | - {foreach item=sInfo from=$page->infoStack} | ||
| 189 | - <span>{$sInfo}</span> | ||
| 190 | - {/foreach} | ||
| 191 | - </div> | ||
| 192 | - {/if} | ||
| 193 | - <!-- and finally, the content. --> | 180 | + {if (!empty($page->errStack))} |
| 181 | + <div class="ktError"> | ||
| 182 | + <div class="error_dashlet_rightrepeat_bottom"></div> | ||
| 183 | + <div class="error_dashlet_leftrepeat_bottom"></div> | ||
| 184 | + {foreach item=sError from=$page->errStack} | ||
| 185 | + <p>{$sError}</p> | ||
| 186 | + {/foreach} | ||
| 187 | + <div class="error_dashlet_topleft_small"></div> | ||
| 188 | + <div class="error_dashlet_toprepeat_small"></div> | ||
| 189 | + <div class="error_dashlet_topright_small"></div> | ||
| 190 | + | ||
| 191 | + <div class="error_dashlet_bottomleft"></div> | ||
| 192 | + <div class="error_dashlet_bottomrepeat_small"></div> | ||
| 193 | + <div class="error_dashlet_bottomright"></div> | ||
| 194 | + </div> | ||
| 195 | + {/if} | ||
| 196 | + | ||
| 197 | + {if (!empty($page->infoStack))} | ||
| 198 | + <div class="ktInfo"> | ||
| 199 | + <div class="info_dashlet_rightrepeat_bottom"></div> | ||
| 200 | + <div class="info_dashlet_leftrepeat_bottom"></div> | ||
| 201 | + {foreach item=sInfo from=$page->infoStack} | ||
| 202 | + <p>{$sInfo}</p> | ||
| 203 | + {/foreach} | ||
| 204 | + <div class="info_dashlet_topleft_small"></div> | ||
| 205 | + <div class="info_dashlet_toprepeat_small"></div> | ||
| 206 | + <div class="info_dashlet_topright_small"></div> | ||
| 207 | + | ||
| 208 | + <div class="info_dashlet_bottomleft"></div> | ||
| 209 | + <div class="info_dashlet_bottomrepeat_small"></div> | ||
| 210 | + <div class="info_dashlet_bottomright"></div> | ||
| 211 | + </div> | ||
| 212 | + {/if} | ||
| 213 | + <!-- and finally, the content. --> | ||
| 194 | {$page->contents} | 214 | {$page->contents} |
| 195 | <div class="floatClear"></div> | 215 | <div class="floatClear"></div> |
| 196 | </div> | 216 | </div> |