Commit 8a9de3cb5fe6d489f8d1879dd424fc555256ee7e
1 parent
a58e6c33
KTS-1589
"The footer/copyright bar should be expandable to cater for disclaimer text. " Fixed. Reviewed By: Kevin git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6429 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
8 changed files
with
61 additions
and
13 deletions
resources/css/kt-framing.css
| @@ -1534,7 +1534,7 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes | @@ -1534,7 +1534,7 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes | ||
| 1534 | 1534 | ||
| 1535 | #copyrightbarBorder { | 1535 | #copyrightbarBorder { |
| 1536 | position: relative; | 1536 | position: relative; |
| 1537 | - height: 2.45em; | 1537 | + height: 62px; |
| 1538 | width: 97.65%; | 1538 | width: 97.65%; |
| 1539 | padding: 0em 1em; | 1539 | padding: 0em 1em; |
| 1540 | margin-top: 10px; | 1540 | margin-top: 10px; |
| @@ -1544,7 +1544,7 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes | @@ -1544,7 +1544,7 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes | ||
| 1544 | #copyrightbarBg { | 1544 | #copyrightbarBg { |
| 1545 | position: absolute; | 1545 | position: absolute; |
| 1546 | background: url(../../resources/graphics/footer_bg.png) top left repeat-x; | 1546 | background: url(../../resources/graphics/footer_bg.png) top left repeat-x; |
| 1547 | - height: 2.45em; | 1547 | + height: 62px; |
| 1548 | width: 99%; | 1548 | width: 99%; |
| 1549 | right: 5px; | 1549 | right: 5px; |
| 1550 | top: 0px; | 1550 | top: 0px; |
| @@ -1554,7 +1554,7 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes | @@ -1554,7 +1554,7 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes | ||
| 1554 | position: absolute; | 1554 | position: absolute; |
| 1555 | background: url(../../resources/graphics/footer_left.png) top left no-repeat; | 1555 | background: url(../../resources/graphics/footer_left.png) top left no-repeat; |
| 1556 | width:8px; | 1556 | width:8px; |
| 1557 | - height:2.45em; | 1557 | + height:62px; |
| 1558 | top:0px; | 1558 | top:0px; |
| 1559 | left:3px; | 1559 | left:3px; |
| 1560 | } | 1560 | } |
| @@ -1562,7 +1562,7 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes | @@ -1562,7 +1562,7 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes | ||
| 1562 | #copyrightbarRight{ | 1562 | #copyrightbarRight{ |
| 1563 | position: absolute; | 1563 | position: absolute; |
| 1564 | background: url(../../resources/graphics/footer_right.png) top right no-repeat; | 1564 | background: url(../../resources/graphics/footer_right.png) top right no-repeat; |
| 1565 | - height:2.45em; | 1565 | + height:62px; |
| 1566 | width:8px; | 1566 | width:8px; |
| 1567 | top:0px; | 1567 | top:0px; |
| 1568 | right:0px; | 1568 | right:0px; |
| @@ -1570,11 +1570,58 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes | @@ -1570,11 +1570,58 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes | ||
| 1570 | 1570 | ||
| 1571 | #copyrightbar { | 1571 | #copyrightbar { |
| 1572 | position: absolute; | 1572 | position: absolute; |
| 1573 | + top:10px; | ||
| 1574 | + left:20px; | ||
| 1575 | + color: #000000; | ||
| 1576 | + font-size: small; | ||
| 1577 | + height:62px; | ||
| 1578 | + width: 98%; | ||
| 1579 | + overflow: hidden; | ||
| 1580 | +} | ||
| 1581 | + | ||
| 1582 | +#copyrightbarBorderDisclaimer { | ||
| 1583 | + position: relative; | ||
| 1584 | + height: 82px; | ||
| 1585 | + width: 97.65%; | ||
| 1586 | + padding: 0em 1em; | ||
| 1587 | + margin-top: 10px; | ||
| 1588 | + margin: 0.5em 0 0.5em 0; | ||
| 1589 | +} | ||
| 1590 | + | ||
| 1591 | +#copyrightbarBgDisclaimer{ | ||
| 1592 | + position: absolute; | ||
| 1593 | + background: url(../../resources/graphics/footer_bg_disclaimer.png) top left repeat-x; | ||
| 1594 | + height: 82px; | ||
| 1595 | + width: 99%; | ||
| 1596 | + right: 5px; | ||
| 1597 | + top: 0px; | ||
| 1598 | +} | ||
| 1599 | + | ||
| 1600 | +#copyrightbarLeftDisclaimer{ | ||
| 1601 | + position: absolute; | ||
| 1602 | + background: url(../../resources/graphics/footer_left_disclaimer.png) top left no-repeat; | ||
| 1603 | + width:8px; | ||
| 1604 | + height:82px; | ||
| 1605 | + top:0px; | ||
| 1606 | + left:3px; | ||
| 1607 | +} | ||
| 1608 | + | ||
| 1609 | +#copyrightbarRightDisclaimer{ | ||
| 1610 | + position: absolute; | ||
| 1611 | + background: url(../../resources/graphics/footer_right_disclaimer.png) top right no-repeat; | ||
| 1612 | + height:82px; | ||
| 1613 | + width:8px; | ||
| 1614 | + top:0px; | ||
| 1615 | + right:0px; | ||
| 1616 | +} | ||
| 1617 | + | ||
| 1618 | +#copyrightbarDisclaimer { | ||
| 1619 | + position: absolute; | ||
| 1573 | top:6px; | 1620 | top:6px; |
| 1574 | left:20px; | 1621 | left:20px; |
| 1575 | color: #000000; | 1622 | color: #000000; |
| 1576 | font-size: small; | 1623 | font-size: small; |
| 1577 | - height: 2.45em; | 1624 | + height:82px; |
| 1578 | width: 98%; | 1625 | width: 98%; |
| 1579 | overflow: hidden; | 1626 | overflow: hidden; |
| 1580 | } | 1627 | } |
resources/graphics/footer_bg.png
resources/graphics/footer_bg_disclaimer.png
0 โ 100644
201 Bytes
resources/graphics/footer_left.png
resources/graphics/footer_left_disclaimer.png
0 โ 100644
380 Bytes
resources/graphics/footer_right.png
resources/graphics/footer_right_disclaimer.png
0 โ 100644
462 Bytes
templates/kt3/standard_page.smarty
| @@ -212,14 +212,15 @@ | @@ -212,14 +212,15 @@ | ||
| 212 | <div id="bodyBottomRight"></div> | 212 | <div id="bodyBottomRight"></div> |
| 213 | <div id="bodyBottomLeft"></div> | 213 | <div id="bodyBottomLeft"></div> |
| 214 | </div> | 214 | </div> |
| 215 | - <div id="copyrightbarBorder"> | ||
| 216 | - <div id="copyrightbarLeft"></div> | ||
| 217 | - <div id="copyrightbarRight"></div> | ||
| 218 | - <div id="copyrightbarBg"></div> | ||
| 219 | - <div id="copyrightbar"> | ||
| 220 | - {i18n}© 2007 <a href="http://www.knowledgetree.com/">The Jam Warehouse Software (Pty) Ltd.</a> All Rights Reserved{/i18n} | ||
| 221 | - — {i18n arg_version="$versionname" arg_appname="$appname"}#appname# Version: #version#{/i18n} — {i18n arg_timing=$page->getReqTime()}Request created in #timing#s{/i18n} | ||
| 222 | - {$page->getDisclaimer()} | 215 | + <div id="{if $page->getDisclaimer() != ''}copyrightbarBorderDisclaimer{else}copyrightbarBorder{/if}"> |
| 216 | + <div id="{if $page->getDisclaimer() != ''}copyrightbarLeftDisclaimer{else}copyrightbarLeft{/if}"></div> | ||
| 217 | + <div id="{if $page->getDisclaimer() != ''}copyrightbarRightDisclaimer{else}copyrightbarRight{/if}"></div> | ||
| 218 | + <div id="{if $page->getDisclaimer() != ''}copyrightbarBgDisclaimer{else}copyrightbarBg{/if}"></div> | ||
| 219 | + <div id="{if $page->getDisclaimer() != ''}copyrightbarDisclaimer{else}copyrightbar{/if}"> | ||
| 220 | + <span style="float:left;">{i18n}© 2007 <a href="http://www.knowledgetree.com/">The Jam Warehouse Software (Pty) Ltd.</a> All Rights Reserved{/i18n}</span> | ||
| 221 | + <span style="float:right; margin-right:5px;">{i18n arg_timing=$page->getReqTime()}Request created in #timing#s{/i18n}</span><br /> | ||
| 222 | + {i18n arg_version="$versionname" arg_appname="$appname"}#appname# Version: #version#{/i18n} | ||
| 223 | + <p>{$page->getDisclaimer()}</p> | ||
| 223 | </div> | 224 | </div> |
| 224 | {if $config->get("ui/poweredByDisabled") == '0'} | 225 | {if $config->get("ui/poweredByDisabled") == '0'} |
| 225 | <a href="{$rootUrl}"><img src="{$config->get("ui/powerLogo")}" class="copyrightbarBorderLogo" alt="{$config->get("ui/powerLogoTitle")}" title="{$config->get("ui/powerLogoTitle")}"/></a> | 226 | <a href="{$rootUrl}"><img src="{$config->get("ui/powerLogo")}" class="copyrightbarBorderLogo" alt="{$config->get("ui/powerLogoTitle")}" title="{$config->get("ui/powerLogoTitle")}"/></a> |