diff --git a/lib/widgets/forms.inc.php b/lib/widgets/forms.inc.php index 6bb051e..73b000b 100644 --- a/lib/widgets/forms.inc.php +++ b/lib/widgets/forms.inc.php @@ -279,7 +279,11 @@ class KTForm { return $oTemplate->render(); } - function renderContaining($sInner) { + function renderContaining() { + + $args = func_get_args(); + $sInner = implode(' ', $args); + $oKTTemplating =& KTTemplating::getSingleton(); $oTemplate = $oKTTemplating->loadTemplate('ktcore/forms/outerform'); diff --git a/resources/css/kt-framing.css b/resources/css/kt-framing.css index d867b20..9a9df26 100644 --- a/resources/css/kt-framing.css +++ b/resources/css/kt-framing.css @@ -404,6 +404,12 @@ a.main_nav_item { font-weight: normal; } +.form_actions .form_cancel { + margin-left: 2em; +} + +/* old cancel style */ + #content a.ktCancelLink { border: 1px solid #888; background: #eee; @@ -452,7 +458,7 @@ a.main_nav_item { #content .field .descriptiveText { margin: 0; - line-height: 1.2em; + line-height: 1.4em; margin-bottom: 0.5em; } @@ -564,6 +570,10 @@ a.main_nav_item { width: 100%; } +.metadatatable.narrow { + width: auto !important; +} + .metadatatable .first th, .metadatatable .first td { border-top: 1px solid #ccc; @@ -692,6 +702,7 @@ a.main_nav_item { white-space: normal !important; } + .centered, .kt_collection thead th.centered { text-align: center; } .centered .ktAction { margin-left: auto; margin-right: auto; width: 100%; background-position: top center;} @@ -829,6 +840,12 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes background-color: transparent; } +.ktActionDescribed { + float: left; + margin-right: 0.5em; +} + + .ktActionLink { padding-left: 25px; background-position: top left; @@ -1035,6 +1052,9 @@ hr { background-image: url(../graphics/edit_metadata.png); } +#content ul { + list-style-image: url(../graphics/bullet.png); +} /* -------------------------- general collapsable blocks ------------------------ */ @@ -1105,6 +1125,3 @@ hr { display: none; } - - - diff --git a/resources/graphics/bullet.png b/resources/graphics/bullet.png new file mode 100644 index 0000000..6e7480a --- /dev/null +++ b/resources/graphics/bullet.png diff --git a/templates/ktcore/forms/buttons.smarty b/templates/ktcore/forms/buttons.smarty index d22411b..a26f65f 100644 --- a/templates/ktcore/forms/buttons.smarty +++ b/templates/ktcore/forms/buttons.smarty @@ -1,6 +1,6 @@