Commit 7789f1de7dc61cdf1285971bf4369d20fefb758a

Authored by bryndivey
1 parent 138538c1

Jalal's latest commit


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6106 c91229c3-7414-0410-bfa2-8a42b809f60b
resources/css/kt-framing.css
@@ -75,6 +75,42 @@ body @@ -75,6 +75,42 @@ body
75 left: 0px; 75 left: 0px;
76 } 76 }
77 77
  78 +#bodyLeftRepeatQuartTop {
  79 + position: absolute;
  80 + background: url(../../resources/graphics/page_border_leftrepeat.gif) top left repeat-y;
  81 + top: 15%;
  82 + left: 0px;
  83 + width: 3px;
  84 + height: 300px;
  85 +}
  86 +
  87 +#bodyLeftRepeatMiddleTop {
  88 + position: absolute;
  89 + background: url(../../resources/graphics/page_border_leftrepeat.gif) top left repeat-y;
  90 + top: 50%;
  91 + left: 0px;
  92 + width: 3px;
  93 + height: 300px;
  94 +}
  95 +
  96 +#bodyLeftRepeatMiddleBottom {
  97 + position: absolute;
  98 + background: url(../../resources/graphics/page_border_leftrepeat.gif) top left repeat-y;
  99 + bottom: 50%;
  100 + left: 0px;
  101 + width: 3px;
  102 + height: 300px;
  103 +}
  104 +
  105 +#bodyLeftRepeatQuartBottom {
  106 + position: absolute;
  107 + background: url(../../resources/graphics/page_border_leftrepeat.gif) top left repeat-y;
  108 + bottom: 25%;
  109 + left: 0px;
  110 + width: 3px;
  111 + height: 300px;
  112 +}
  113 +
78 #bodyLeftRepeatBottom { 114 #bodyLeftRepeatBottom {
79 position: absolute; 115 position: absolute;
80 background: url(../../resources/graphics/page_border_leftrepeat.gif) top left repeat-y; 116 background: url(../../resources/graphics/page_border_leftrepeat.gif) top left repeat-y;
@@ -93,6 +129,42 @@ body @@ -93,6 +129,42 @@ body
93 right: 0px; 129 right: 0px;
94 } 130 }
95 131
  132 +#bodyRightRepeatQuartTop {
  133 + position: absolute;
  134 + background: url(../../resources/graphics/page_border_rightrepeat.gif) top right repeat-y;
  135 + top: 15%;
  136 + right: 0px;
  137 + width: 8px;
  138 + height: 300px;
  139 +}
  140 +
  141 +#bodyRightRepeatMiddleTop {
  142 + position: absolute;
  143 + background: url(../../resources/graphics/page_border_rightrepeat.gif) top right repeat-y;
  144 + top: 50%;
  145 + right: 0px;
  146 + width: 8px;
  147 + height: 300px;
  148 +}
  149 +
  150 +#bodyRightRepeatMiddleBottom {
  151 + position: absolute;
  152 + background: url(../../resources/graphics/page_border_rightrepeat.gif) top right repeat-y;
  153 + bottom: 50%;
  154 + right: 0px;
  155 + width: 8px;
  156 + height: 300px;
  157 +}
  158 +
  159 +#bodyRightRepeatQuartBottom {
  160 + position: absolute;
  161 + background: url(../../resources/graphics/page_border_rightrepeat.gif) top right repeat-y;
  162 + bottom: 25%;
  163 + right: 0px;
  164 + width: 8px;
  165 + height: 300px;
  166 +}
  167 +
96 #bodyRightRepeatBottom { 168 #bodyRightRepeatBottom {
97 position: absolute; 169 position: absolute;
98 background: url(../../resources/graphics/page_border_rightrepeat.gif) top right repeat-y; 170 background: url(../../resources/graphics/page_border_rightrepeat.gif) top right repeat-y;
@@ -242,6 +314,12 @@ body @@ -242,6 +314,12 @@ body
242 border-bottom: 1px solid white; 314 border-bottom: 1px solid white;
243 } 315 }
244 316
  317 +#menu_divider {
  318 + background: url(../../resources/graphics/menu_divider.png) top left no-repeat;
  319 + width: 2px;
  320 + height: 31px;
  321 +}
  322 +
245 .ktLoggedInUser { 323 .ktLoggedInUser {
246 font-weight: bold; 324 font-weight: bold;
247 } 325 }
@@ -384,17 +462,51 @@ a.main_nav_item { @@ -384,17 +462,51 @@ a.main_nav_item {
384 } 462 }
385 463
386 #portletbar .portlet .portletbody { 464 #portletbar .portlet .portletbody {
387 - position: relative;  
388 - background: url(../../resources/graphics/portlet_borderrepeat.png) top left repeat-y; 465 + /* This is for the left-hand side border */
  466 + /*background: url(../../resources/graphics/portlet_borderrepeat.png) top left repeat-y;*/
  467 + background: url(../../resources/graphics/portlet_borderright.png) top right repeat-y;
389 padding: 0 0 1em 0; 468 padding: 0 0 1em 0;
  469 + margin-right: 1px;
390 background-color: white; 470 background-color: white;
391 - border: 0; 471 + border-bottom: 1px solid #ccc;
  472 + border-left: 1px solid #ccc;
  473 + width: 99%;
  474 + height: 100%;
  475 +}
  476 +
  477 +/* Attempt to contain side portlet containers in MORE containers*/
  478 +/*
  479 +#portletbar .portlet.expanded .portletBodyDoubleTop {
  480 + position: relative;
392 width: 100%; 481 width: 100%;
393 - height: 100%; 482 + height: 1px;
  483 + top:0px;
  484 + right:0px;
  485 + border: 1px solid red;
  486 +}
  487 +
  488 +#portletbar .portlet.expanded .portletBodyDoubleMiddle {
  489 + position: relative;
  490 + width: 100%;
  491 + height: 1px;
  492 + top:0px;
  493 + right:0px;
  494 + border: 1px solid blue;
394 } 495 }
395 496
  497 +#portletbar .portlet.expanded .portletBodyDoubleBottom {
  498 + position: relative;
  499 + width: 100%;
  500 + height: 1px;
  501 + bottom:0px;
  502 + right:0px;
  503 + border: 1px solid red;
  504 +}*/
  505 +
  506 +/* Bottom Portlet borders */
  507 +/*
396 #portletbar .portlet .portletbodyBottomLeft { 508 #portletbar .portlet .portletbodyBottomLeft {
397 - position: absolute; 509 + position: absolute;
398 bottom: 0px; 510 bottom: 0px;
399 left: 0px; 511 left: 0px;
400 width: 10px; 512 width: 10px;
@@ -418,8 +530,10 @@ a.main_nav_item { @@ -418,8 +530,10 @@ a.main_nav_item {
418 height: 3px; 530 height: 3px;
419 width: 95%; 531 width: 95%;
420 background: url(../../resources/graphics/portlet_borderbottom.png) bottom left repeat-x; 532 background: url(../../resources/graphics/portlet_borderbottom.png) bottom left repeat-x;
421 -} 533 +}*/
422 534
  535 +/* Right-hand side portlet borders */
  536 +/*
423 #portletbar .portlet .portletbodyRightTop { 537 #portletbar .portlet .portletbodyRightTop {
424 position: absolute; 538 position: absolute;
425 background: url(../../resources/graphics/portlet_borderright.png) top right repeat-y; 539 background: url(../../resources/graphics/portlet_borderright.png) top right repeat-y;
@@ -432,7 +546,7 @@ a.main_nav_item { @@ -432,7 +546,7 @@ a.main_nav_item {
432 #portletbar .portlet .portletbodyRightBottom { 546 #portletbar .portlet .portletbodyRightBottom {
433 position: absolute; 547 position: absolute;
434 background: url(../../resources/graphics/portlet_borderright.png) top right repeat-y; 548 background: url(../../resources/graphics/portlet_borderright.png) top right repeat-y;
435 - bottom: 10px; 549 + bottom: 0px;
436 right: 0px; 550 right: 0px;
437 width: 5px; 551 width: 5px;
438 height: 80px; 552 height: 80px;
@@ -473,7 +587,7 @@ a.main_nav_item { @@ -473,7 +587,7 @@ a.main_nav_item {
473 right: 0px; 587 right: 0px;
474 width: 5px; 588 width: 5px;
475 height: 68px; 589 height: 68px;
476 -} 590 +}*/
477 591
478 #portletbar .portlet a { 592 #portletbar .portlet a {
479 text-decoration: none; 593 text-decoration: none;
@@ -1362,7 +1476,7 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes @@ -1362,7 +1476,7 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes
1362 background: url(../../resources/graphics/footer_bg.png) top left repeat-x; 1476 background: url(../../resources/graphics/footer_bg.png) top left repeat-x;
1363 height: 2.45em; 1477 height: 2.45em;
1364 width: 99%; 1478 width: 99%;
1365 - right: 3px; 1479 + right: 5px;
1366 top: 0px; 1480 top: 0px;
1367 } 1481 }
1368 1482
resources/css/kt-ie-icons.css
@@ -82,6 +82,10 @@ @@ -82,6 +82,10 @@
82 width: 65%; 82 width: 65%;
83 } 83 }
84 84
  85 +#menu_divider {
  86 + background: url(../../resources/graphics/menu_divider.gif) top left no-repeat;
  87 +}
  88 +
85 89
86 /* NO CHILD SELECTORS IN IE! */ 90 /* NO CHILD SELECTORS IN IE! */
87 91
resources/css/kt-login.css
@@ -13,16 +13,91 @@ @@ -13,16 +13,91 @@
13 } 13 }
14 14
15 #loginbox { 15 #loginbox {
  16 + position: relative;
16 padding: 1em; 17 padding: 1em;
17 - border: 1px solid #888; 18 + /*border: 1px solid #888;*/
18 width: 252px; 19 width: 252px;
19 margin-left: auto; 20 margin-left: auto;
20 margin-right: auto; 21 margin-right: auto;
21 text-align: left; 22 text-align: left;
22 - background: white url(../graphics/ktbg.png) bottom right no-repeat;  
23 - -moz-border-radius: 1em; 23 + background: white url(../graphics/ktbg.png) bottom left no-repeat;
  24 + /*-moz-border-radius: 1em;*/
24 } 25 }
25 26
  27 + #loginboxTopLeft {
  28 + position: absolute;
  29 + background: url(../graphics/login_corner_topleft.gif) top left no-repeat;
  30 + top: 0;
  31 + left: 0;
  32 + width: 40px;
  33 + height: 40px;
  34 + }
  35 +
  36 + #loginboxTopMiddle {
  37 + position: absolute;
  38 + background: url(../graphics/login_border_repeat.png) top left repeat-x;
  39 + top:0;
  40 + left:35px;
  41 + width: 230px;
  42 + height: 3px;
  43 + }
  44 +
  45 + #loginboxTopRight {
  46 + position: absolute;
  47 + background: url(../graphics/login_corner_topright.gif) top right no-repeat;
  48 + top:0;
  49 + right:0;
  50 + width: 40px;
  51 + height: 40px;
  52 + }
  53 +
  54 + #loginboxBottomLeft {
  55 + position: absolute;
  56 + background: url(../graphics/login_corner_bottomleft.gif) bottom left no-repeat;
  57 + bottom:0;
  58 + left:0;
  59 + width: 40px;
  60 + height: 40px;
  61 + }
  62 +
  63 + #loginboxBottomMiddle {
  64 + position: absolute;
  65 + background: url(../graphics/login_border_bottom.png) bottom left repeat-x;
  66 + bottom: 0;
  67 + left: 35px;
  68 + width: 230px;
  69 + height: 3px;
  70 + }
  71 +
  72 + #loginboxBottomRight {
  73 + position: absolute;
  74 + background: url(../graphics/login_corner_bottomright.gif) bottom left no-repeat;
  75 + bottom: 0;
  76 + right: 0;
  77 + width: 40px;
  78 + height: 40px;
  79 + }
  80 +
  81 + #loginboxLeft {
  82 + position: absolute;
  83 + background: url(../graphics/login_border_repeat.png) top left repeat-y;
  84 + top: 35px;
  85 + left: 0;
  86 + width: 3px;
  87 + height: 405px;
  88 + }
  89 +
  90 + #loginboxRight {
  91 + position: absolute;
  92 + background: url(../graphics/login_border_right.png) top right repeat-y;
  93 + top: 35px;
  94 + right: 0;
  95 + width: 3px;
  96 + height: 405px;
  97 + }
  98 +
  99 +
  100 +
26 #loginbox.hasDisclaimer { 101 #loginbox.hasDisclaimer {
27 width: 564px; 102 width: 564px;
28 } 103 }
@@ -89,6 +164,10 @@ @@ -89,6 +164,10 @@
89 font-size: x-small; 164 font-size: x-small;
90 } 165 }
91 166
  167 +#bottomspacer {
  168 + height: 50px;
  169 +
  170 +}
92 171
93 /* block level. */ 172 /* block level. */
94 .ktError 173 .ktError
resources/graphics/ktbg.png

16.3 KB | W: | H:

29.8 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
resources/graphics/ktbg_old.png 0 → 100644

16.3 KB

resources/graphics/login_border_bottom.png 0 → 100644

190 Bytes

resources/graphics/login_border_repeat.png 0 → 100644

179 Bytes

resources/graphics/login_border_right.png 0 → 100644

187 Bytes

resources/graphics/login_corner_bottomleft.gif 0 → 100644

1.01 KB

resources/graphics/login_corner_bottomright.gif 0 → 100644

1.04 KB

resources/graphics/login_corner_topleft.gif 0 → 100644

949 Bytes

resources/graphics/login_corner_topright.gif 0 → 100644

991 Bytes

resources/graphics/menu_divider.gif 0 → 100644

845 Bytes

resources/graphics/menu_divider.png

226 Bytes | W: | H:

308 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
resources/graphics/portlet_borderright.png

188 Bytes | W: | H:

112 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
resources/graphics/portlet_borderright_future.png 0 → 100644

188 Bytes

templates/kt3/standard_page.smarty
@@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
71 {else} 71 {else}
72 <li><a href="{$aMenuItem.url}">{$aMenuItem.label}</a></li> 72 <li><a href="{$aMenuItem.url}">{$aMenuItem.label}</a></li>
73 {/if} 73 {/if}
74 - <li><img src="{$rootUrl}/resources/graphics/menu_divider.png"/></li> 74 + <li><div id="menu_divider"></div></li>
75 {/foreach} 75 {/foreach}
76 76
77 <!-- user menu --> 77 <!-- user menu -->
@@ -140,16 +140,7 @@ @@ -140,16 +140,7 @@
140 <div class="portletTopRepeat"></div> 140 <div class="portletTopRepeat"></div>
141 <div class="portletTopRight"></div> 141 <div class="portletTopRight"></div>
142 <div class="portletbody"> 142 <div class="portletbody">
143 - <div class="portletbodyRightTop"></div>  
144 - <div class="portletbodyRightMiddleTop"></div>  
145 - <div class="portletbodyRightMiddleBottom"></div>  
146 - <div class="portletbodyRightQuartTop"></div>  
147 - <div class="portletbodyRightQuartBottom"></div>  
148 - <div class="portletbodyRightBottom"></div>  
149 {$portlet_output} 143 {$portlet_output}
150 - <div class="portletbodyBottom"></div>  
151 - <div class="portletbodyBottomLeft"></div>  
152 - <div class="portletbodyBottomRight"></div>  
153 </div> 144 </div>
154 </div> 145 </div>
155 {/if} 146 {/if}
@@ -187,8 +178,16 @@ @@ -187,8 +178,16 @@
187 </div> 178 </div>
188 <div id="pageBodyBg"></div> 179 <div id="pageBodyBg"></div>
189 <div id="bodyLeftRepeatTop"></div> 180 <div id="bodyLeftRepeatTop"></div>
  181 + <div id="bodyLeftRepeatQuartTop"></div>
  182 + <div id="bodyLeftRepeatMiddleTop"></div>
  183 + <div id="bodyLeftRepeatMiddleBottom"></div>
  184 + <div id="bodyLeftRepeatQuartBottom"></div>
190 <div id="bodyLeftRepeatBottom"></div> 185 <div id="bodyLeftRepeatBottom"></div>
191 <div id="bodyRightRepeatTop"></div> 186 <div id="bodyRightRepeatTop"></div>
  187 + <div id="bodyRightRepeatQuartTop"></div>
  188 + <div id="bodyRightRepeatMiddleTop"></div>
  189 + <div id="bodyRightRepeatMiddleBottom"></div>
  190 + <div id="bodyRightRepeatQuartBottom"></div>
192 <div id="bodyRightRepeatBottom"></div> 191 <div id="bodyRightRepeatBottom"></div>
193 <div id="bodyBottomRepeat"></div> 192 <div id="bodyBottomRepeat"></div>
194 <div id="bodyBottomRight"></div> 193 <div id="bodyBottomRight"></div>
templates/ktcore/login.smarty
@@ -46,21 +46,27 @@ @@ -46,21 +46,27 @@
46 <input type="submit" value="{i18n}login{/i18n}" /> 46 <input type="submit" value="{i18n}login{/i18n}" />
47 </div> 47 </div>
48 </form> 48 </form>
49 -  
50 </div> 49 </div>
51 -  
52 {if ($disclaimer)} 50 {if ($disclaimer)}
53 <div id="disclaimerbox"> 51 <div id="disclaimerbox">
54 {$disclaimer} 52 {$disclaimer}
55 </div> 53 </div>
56 {/if} 54 {/if}
57 55
58 - <p class="descriptiveText version"> 56 + <span class="descriptiveText version">
59 {i18n}KnowledgeTree Version{/i18n}<br />{$versionName}<br/> 57 {i18n}KnowledgeTree Version{/i18n}<br />{$versionName}<br/>
60 {i18n}&copy; 2006 <a href="http://www.knowledgetree.com/">The Jam Warehouse Software (Pty) Ltd.</a> All Rights Reserved{/i18n} 58 {i18n}&copy; 2006 <a href="http://www.knowledgetree.com/">The Jam Warehouse Software (Pty) Ltd.</a> All Rights Reserved{/i18n}
61 - </p> 59 + </span>
  60 + <div id="bottomspacer"></div>
62 61
63 - 62 + <div id="loginboxTopLeft"></div>
  63 + <div id="loginboxTopMiddle"></div>
  64 + <div id="loginboxTopRight"></div>
  65 + <div id="loginboxBottomLeft"></div>
  66 + <div id="loginboxBottomMiddle"></div>
  67 + <div id="loginboxBottomRight"></div>
  68 + <div id="loginboxLeft"></div>
  69 + <div id="loginboxRight"></div>
64 </div> 70 </div>
65 71
66 72