Commit d80f04dfb9ade81c6985328ad5a20bfb8523766d

Authored by jalaloedien
1 parent 20567c8f

KTS-1695

"Clean up Dashboard dashlet headings as per mockups"
Implemented.

Reviewed By: Conrad

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6311 c91229c3-7414-0410-bfa2-8a42b809f60b
resources/css/kt-framing.css
... ... @@ -1224,14 +1224,15 @@ a.main_nav_item {
1224 1224  
1225 1225  
1226 1226 .ktBlock {
1227   - padding: 0 1em;
1228   - border: 1px solid #c5c5c5;
1229   - background-color: #fcfcfc;
1230   - margin: 0.5em 0;
  1227 + padding: 0.1em 1em;
  1228 + /*border-right: 1px solid #c5c5c5;*/
  1229 + /*background-color: #fcfcfc;*/
  1230 + margin: 1em 0;
  1231 + position:relative;
1231 1232 }
1232 1233  
1233 1234  
1234   -.ktBlock, .ktInfo, .ktError {
  1235 +.ktInfo, .ktError {
1235 1236 background-repeat: repeat-x;
1236 1237 background-position: top left;
1237 1238 }
... ... @@ -1244,14 +1245,12 @@ a.main_nav_item {
1244 1245 background-image: url(../../resources/graphics/dashlet-gradient-error.gif);
1245 1246 }
1246 1247  
1247   -#dashboard-container-left .ktBlock,
1248 1248 #dashboard-container-left .ktInfo,
1249 1249 #dashboard-container-left .ktError,
1250   -#dashboard-container-right .ktBlock,
1251 1250 #dashboard-container-right .ktInfo,
1252 1251 #dashboard-container-right .ktError
1253 1252 {
1254   - -moz-border-radius: 15px;
  1253 + -moz-border-radius: 15px;
1255 1254 }
1256 1255 #dashboardBox {
1257 1256 width: 80%
... ... @@ -1410,73 +1409,139 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes
1410 1409 /* background-color: #ddf; */
1411 1410 }
1412 1411  
1413   -#dashboard_block_topleft {
  1412 +.dashboard_block_topleft {
1414 1413 position: absolute;
1415   - width: 40px;
1416   - height: 40px;
  1414 + width: 35px;
  1415 + height: 36px;
1417 1416 top: 0px;
1418 1417 left: 0px;
  1418 + background: url(../graphics/dashlet_topleft.png) top left no-repeat;
  1419 + z-index:-1;
1419 1420 }
1420 1421  
1421   -#dashboard_block_toprepeat {
  1422 +.dashboard_block_toprepeat {
1422 1423 position: absolute;
1423   - width: 95%;
1424   - height: 3px;
  1424 + width: 90%;
  1425 + height: 36px;
1425 1426 top: 0px;
1426 1427 left: 30px;
  1428 + background: white url(../graphics/dashlet_toprepeat.png) top left repeat-x;
  1429 + z-index:-1;
1427 1430 }
1428 1431  
1429   -#dashboard_block_topright {
  1432 +.dashboard_block_topright {
1430 1433 position: absolute;
1431   - width: 40px;
1432   - height: 40px;
  1434 + width: 35px;
  1435 + height: 36px;
1433 1436 top: 0px;
1434 1437 right: 0px;
  1438 + background: url(../graphics/dashlet_topright.png) top right no-repeat;
  1439 + z-index:-1;
1435 1440 }
1436 1441  
1437   -#dashboard_block_leftrepeat {
  1442 +.dashboard_block_leftrepeat_top {
1438 1443 position: absolute;
1439   - width: 3px;
1440   - height: 95%;
1441   - top: 30px;
  1444 + width: 13px;
  1445 + height: 50%;
  1446 + top: 5px;
1442 1447 left: 0px;
  1448 + background: white url(../graphics/dashlet_leftrepeat.png) top left repeat-y;
  1449 + z-index:-1;
1443 1450 }
1444 1451  
1445   -#dashboard_block_bottomleft {
  1452 +.dashboard_block_leftrepeat_bottom {
  1453 + position: absolute;
  1454 + width: 13px;
  1455 + height: 50%;
  1456 + bottom: 10px;
  1457 + left: 0px;
  1458 + background: white url(../graphics/dashlet_leftrepeat.png) top left repeat-y;
  1459 + z-index:-1;
  1460 +}
  1461 +
  1462 +.dashboard_block_bottomleft {
1446 1463 position: absolute;
1447 1464 width: 40px;
1448 1465 height: 40px;
1449 1466 bottom: 0px;
1450 1467 left: 0px;
  1468 + background: url(../graphics/dashlet_bottomleft.png) bottom left no-repeat;
  1469 + z-index:-1;
1451 1470 }
1452 1471  
1453   -#dashboard_block_bottomrepeat {
  1472 +.dashboard_block_bottomrepeat {
1454 1473 position: absolute;
1455   - width: 95%;
1456   - height: 3px;
  1474 + width: 90%;
  1475 + height: 13px;
1457 1476 bottom: 0px;
1458 1477 left: 30px;
  1478 + background: white url(../graphics/dashlet_bottomrepeat.png) bottom left repeat-x;
  1479 + z-index:-1;
1459 1480 }
1460 1481  
1461   -#dashboard_block_bottomright {
  1482 +.dashboard_block_bottomright {
1462 1483 position: absolute;
1463 1484 width: 40px;
1464 1485 height: 40px;
1465 1486 bottom: 0px;
1466 1487 right: 0px;
  1488 + background: url(../graphics/dashlet_bottomright.png) bottom right no-repeat;
  1489 + z-index:-1;
1467 1490 }
1468 1491  
1469   -#dashboard_block_rightrepeat {
  1492 +.dashboard_block_rightrepeat_top {
1470 1493 position: absolute;
1471   - width: 3px;
1472   - height: 95%;
1473   - top: 30px;
  1494 + width: 13px;
  1495 + height: 50%;
  1496 + top: 5px;
1474 1497 right: 0px;
  1498 + background: white url(../graphics/dashlet_rightrepeat.png) top right repeat-y;
  1499 + z-index:-1;
  1500 + overflow:hidden;
  1501 +}
  1502 +
  1503 +.dashboard_block_rightrepeat_bottom {
  1504 + position: absolute;
  1505 + width: 13px;
  1506 + height: 50%;
  1507 + bottom: 10px;
  1508 + right: 0px;
  1509 + background: white url(../graphics/dashlet_rightrepeat.png) bottom right repeat-y;
  1510 + z-index:-1;
  1511 + overflow:hidden;
  1512 +}
  1513 +
  1514 +.dashboard_block_rightrepeat_top {
  1515 + min-height: 70px;
  1516 +}
  1517 +
  1518 +.dashboard_block.rolled-up .dashboard_block_rightrepeat_top
  1519 +{
  1520 + display: none;
  1521 +}
  1522 +
  1523 +.dashboard_block.rolled-up .dashboard_block_rightrepeat_bottom
  1524 +{
  1525 + display: none;
  1526 +}
  1527 +
  1528 +.dashboard_block.rolled-up .dashboard_block_leftrepeat_top
  1529 +{
  1530 + display: none;
  1531 +}
  1532 +
  1533 +.dashboard_block.rolled-up .dashboard_block_leftrepeat_bottom
  1534 +{
  1535 + display: none;
1475 1536 }
1476 1537  
1477 1538 .dashboard_block {
1478 1539 width: 100%;
1479   -/* background-color: #fdd; */
  1540 + /*background-color: #fdd;*/
  1541 +}
  1542 +
  1543 +.dashboard_block_empty{
  1544 + border:none;
1480 1545 }
1481 1546  
1482 1547 #copyrightbarBorder {
... ... @@ -1730,13 +1795,15 @@ hr {
1730 1795 {
1731 1796 float: right;
1732 1797 text-align: right;
1733   - margin: 0.75em 0em 0 0;
  1798 + margin: 0.2em 0em 0 0;
1734 1799 z-index: 100;
1735 1800 }
1736 1801  
1737 1802 .dashboard_block_handle
1738 1803 {
1739 1804 cursor: pointer;
  1805 + margin: 0.2em -0.5em 0.5em 0;
  1806 + font-size:small;
1740 1807 }
1741 1808  
1742 1809 .dashboard_block.rolled-up .dashboard_block_body
... ... @@ -1744,9 +1811,17 @@ hr {
1744 1811 display: none;
1745 1812 }
1746 1813  
1747   -.dashboard_block .dashboard_block_body
  1814 +.ktBlock .dashboard_block_body
1748 1815 {
1749 1816 z-index:99;
  1817 + margin: 8px 0 10px 0;
  1818 + background-color:#FFFFFF;
  1819 +}
  1820 +
  1821 +.dashboard_block .dashboard_block_body .edit_action
  1822 +{
  1823 + z-index:99;
  1824 + background-color:#FFFFFF;
1750 1825 }
1751 1826  
1752 1827 /* actions */
... ... @@ -1783,9 +1858,15 @@ hr {
1783 1858 #content .dashboard_block.rolled-up h2
1784 1859 {
1785 1860 border-bottom-width: 0px;
1786   - padding-bottom: 0px;
  1861 + padding-bottom: 10px;
1787 1862 }
1788 1863  
  1864 +#content .ktBlock h2
  1865 +{
  1866 + border-bottom-width: 0px;
  1867 + color: #FFFFFF;
  1868 + font-size: small;
  1869 +}
1789 1870  
1790 1871 #content .dashboard_block.closed
1791 1872 {
... ...
resources/graphics/bullet_toggle_close.png

179 Bytes | W: | H:

396 Bytes | W: | H:

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

172 Bytes | W: | H:

516 Bytes | W: | H:

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

176 Bytes | W: | H:

269 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
resources/graphics/dashlet_bottomleft.png 0 โ†’ 100644

292 Bytes

resources/graphics/dashlet_bottomrepeat.png 0 โ†’ 100644

210 Bytes

resources/graphics/dashlet_bottomright.png 0 โ†’ 100644

368 Bytes

resources/graphics/dashlet_leftrepeat.png 0 โ†’ 100644

199 Bytes

resources/graphics/dashlet_rightrepeat.png 0 โ†’ 100644

208 Bytes

resources/graphics/dashlet_topleft.png 0 โ†’ 100644

798 Bytes

resources/graphics/dashlet_toprepeat.png 0 โ†’ 100644

271 Bytes

resources/graphics/dashlet_topright.png 0 โ†’ 100644

950 Bytes

templates/kt3/dashboard.smarty
1 1 <div id="dashboard-container-left">
2   - <div class="dashboard_block empty" id="start-left">&nbsp;</div>
  2 + <div class="dashboard_block_empty" id="start-left">&nbsp;</div>
3 3 {foreach item=oDashlet from=$dashlets_left}
4 4 <div class="dashboard_block" id="{$context->_getDashletId($oDashlet)}">
5 5 <div class="{$oDashlet->sClass}">
  6 + {if $oDashlet->sClass === "ktBlock"}
  7 + <div class="dashboard_block_rightrepeat_top"></div>
  8 + <div class="dashboard_block_rightrepeat_bottom"></div>
  9 + <div class="dashboard_block_leftrepeat_top"></div>
  10 + <div class="dashboard_block_leftrepeat_bottom"></div>
  11 + {/if}
  12 +
6 13 <div class="dashboard_block_icons">
7 14 <a href="#" class="action action_rollup">&nbsp;</a>
8 15 <a href="#" class="action action_close">&nbsp;</a>
... ... @@ -13,31 +20,55 @@
13 20 <div class="dashboard_block_body">
14 21 {$oDashlet->render()}
15 22 </div>
  23 + {if $oDashlet->sClass === "ktBlock"}
  24 + <div class="dashboard_block_topleft"></div>
  25 + <div class="dashboard_block_toprepeat"></div>
  26 + <div class="dashboard_block_topright"></div>
  27 +
  28 + <div class="dashboard_block_bottomleft"></div>
  29 + <div class="dashboard_block_bottomrepeat"></div>
  30 + <div class="dashboard_block_bottomright"></div>
  31 + {/if}
16 32 </div>
17 33 </div>
18 34 {/foreach}
19   - <div class="dashboard_block empty" id="end-left">&nbsp;</div>
  35 + <div class="dashboard_block_empty" id="end-left">&nbsp;</div>
20 36 </div>
21 37  
22 38 <div id="dashboard-container-right">
23   - <div class="dashboard_block empty" id="start-right">&nbsp;</div>
  39 + <div class="dashboard_block_empty" id="start-right">&nbsp;</div>
24 40 {foreach item=oDashlet from=$dashlets_right}
25 41 <div class="dashboard_block" id="{$context->_getDashletId($oDashlet)}">
26 42 <div class="{$oDashlet->sClass}">
  43 + {if $oDashlet->sClass === "ktBlock"}
  44 + <div class="dashboard_block_rightrepeat_top"></div>
  45 + <div class="dashboard_block_rightrepeat_bottom"></div>
  46 + <div class="dashboard_block_leftrepeat_top"></div>
  47 + <div class="dashboard_block_leftrepeat_bottom"></div>
  48 + {/if}
27 49 <div class="dashboard_block_icons">
28 50 <a href="#" class="action action_rollup">&nbsp;</a>
29 51 <a href="#" class="action action_close">&nbsp;</a>
30 52 </div>
31   -
32 53 <h2 class="dashboard_block_handle">{$oDashlet->sTitle}</h2>
33 54  
34 55 <div class="dashboard_block_body">
35 56 {$oDashlet->render()}
36 57 </div>
  58 +
  59 + {if $oDashlet->sClass === "ktBlock"}
  60 + <div class="dashboard_block_topleft"></div>
  61 + <div class="dashboard_block_toprepeat"></div>
  62 + <div class="dashboard_block_topright"></div>
  63 +
  64 + <div class="dashboard_block_bottomleft"></div>
  65 + <div class="dashboard_block_bottomrepeat"></div>
  66 + <div class="dashboard_block_bottomright"></div>
  67 + {/if}
37 68 </div>
38 69 </div>
39 70 {/foreach}
40   - <div class="dashboard_block empty" id="end-right">&nbsp;</div>
  71 + <div class="dashboard_block_empty" id="end-right">&nbsp;</div>
41 72 </div>
42 73  
43 74  
... ...
templates/ktcore/dashlets/kt3release.smarty
1 1 {$body}
2 2  
3 3 {if $can_edit}
4   -<p><a class="ktAction ktEdit ktInline"
5   - href="{ktLink base="admin.php" subpath="/misc/helpmanagement" query="action=customise&name=`$target_name`"}" >{i18n}Edit this introduction.{/i18n}</a>
6   -<a href="{ktLink base="admin.php" subpath="/misc/helpmanagement" query="action=customise&name=`$target_name`"}">{i18n}Edit this introduction.{/i18n}</a>
7   -{if $help_id}| <a class="ktActionLink ktDelete" href="{ktLink base="admin.php" subpath="/misc/helpmanagement" query="action=deleteReplacement&id=`$help_id`"}">{i18n}Use the standard introduction.{/i18n}</a>
8   -
9   -{/if}
10   -</p>
  4 +<span class="edit_action">
  5 + <a class="ktAction ktEdit ktInline" href="{ktLink base="admin.php" subpath="/misc/helpmanagement" query="action=customise&name=`$target_name`"}" >
  6 + {i18n}Edit this introduction.{/i18n}
  7 + </a>
  8 + <a href="{ktLink base="admin.php" subpath="/misc/helpmanagement" query="action=customise&name=`$target_name`"}">
  9 + {i18n}Edit this introduction.{/i18n}
  10 + </a>
  11 + {if $help_id}| <a class="ktActionLink ktDelete" href="{ktLink base="admin.php" subpath="/misc/helpmanagement" query="action=deleteReplacement&id=`$help_id`"}">{i18n}Use the standard introduction.{/i18n}</a>{/if}
  12 +</span>
11 13 {/if}
... ...
thirdparty/icon-theme/16x16/actions/document-properties.gif

353 Bytes | W: | H:

1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
thirdparty/icon-theme/16x16/actions/document-properties.png

551 Bytes | W: | H:

799 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin