Commit f052406c9c5602397b6a5c61af98027e22ad54cf

Authored by Brad Shuttleworth
1 parent b24c14c0

simple fixes to the ways forms / some ui elements work.


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5888 c91229c3-7414-0410-bfa2-8a42b809f60b
lib/widgets/forms.inc.php
... ... @@ -279,7 +279,11 @@ class KTForm {
279 279 return $oTemplate->render();
280 280 }
281 281  
282   - function renderContaining($sInner) {
  282 + function renderContaining() {
  283 +
  284 + $args = func_get_args();
  285 + $sInner = implode(' ', $args);
  286 +
283 287 $oKTTemplating =& KTTemplating::getSingleton();
284 288 $oTemplate = $oKTTemplating->loadTemplate('ktcore/forms/outerform');
285 289  
... ...
resources/css/kt-framing.css
... ... @@ -404,6 +404,12 @@ a.main_nav_item {
404 404 font-weight: normal;
405 405 }
406 406  
  407 +.form_actions .form_cancel {
  408 + margin-left: 2em;
  409 +}
  410 +
  411 +/* old cancel style */
  412 +
407 413 #content a.ktCancelLink {
408 414 border: 1px solid #888;
409 415 background: #eee;
... ... @@ -452,7 +458,7 @@ a.main_nav_item {
452 458 #content .field .descriptiveText
453 459 {
454 460 margin: 0;
455   - line-height: 1.2em;
  461 + line-height: 1.4em;
456 462 margin-bottom: 0.5em;
457 463 }
458 464  
... ... @@ -564,6 +570,10 @@ a.main_nav_item {
564 570 width: 100%;
565 571 }
566 572  
  573 +.metadatatable.narrow {
  574 + width: auto !important;
  575 +}
  576 +
567 577 .metadatatable .first th,
568 578 .metadatatable .first td {
569 579 border-top: 1px solid #ccc;
... ... @@ -692,6 +702,7 @@ a.main_nav_item {
692 702 white-space: normal !important;
693 703 }
694 704  
  705 +
695 706 .centered, .kt_collection thead th.centered { text-align: center; }
696 707 .centered .ktAction { margin-left: auto; margin-right: auto; width: 100%; background-position: top center;}
697 708  
... ... @@ -829,6 +840,12 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes
829 840 background-color: transparent;
830 841 }
831 842  
  843 +.ktActionDescribed {
  844 + float: left;
  845 + margin-right: 0.5em;
  846 +}
  847 +
  848 +
832 849 .ktActionLink {
833 850 padding-left: 25px;
834 851 background-position: top left;
... ... @@ -1035,6 +1052,9 @@ hr {
1035 1052 background-image: url(../graphics/edit_metadata.png);
1036 1053 }
1037 1054  
  1055 +#content ul {
  1056 + list-style-image: url(../graphics/bullet.png);
  1057 +}
1038 1058  
1039 1059  
1040 1060 /* -------------------------- general collapsable blocks ------------------------ */
... ... @@ -1105,6 +1125,3 @@ hr {
1105 1125 display: none;
1106 1126 }
1107 1127  
1108   -
1109   -
1110   -
... ...
resources/graphics/bullet.png 0 → 100644

166 Bytes

templates/ktcore/forms/buttons.smarty
1 1 <div class="form_actions">
2 2 <input type="submit" name="" value="{$context->_submitlabel}" />
3 3 {if ($context->bCancel)}
4   - <a href="{$context->_cancelurl}">{i18n}Cancel{/i18n}</a>
  4 + <a class="form_cancel" href="{$context->_cancelurl}">{i18n}Cancel{/i18n}</a>
5 5 {/if}
6   -</div>
7 6 \ No newline at end of file
  7 +</div>
... ...