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

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
Brad Shuttleworth
1 parent b24c14c0
Showing 4 changed files with 28 additions and 7 deletions
lib/widgets/forms.inc.php
resources/css/kt-framing.css
resources/graphics/bullet.png
templates/ktcore/forms/buttons.smarty
@@ -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');
@@ -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;
 }
-
-
-
 <div class="form_actions">
     <input type="submit" name="" value="{$context->_submitlabel}" /> 
     {if ($context->bCancel)}
-        <a href="{$context->_cancelurl}">{i18n}Cancel{/i18n}</a>
+        <a class="form_cancel" href="{$context->_cancelurl}">{i18n}Cancel{/i18n}</a>
     {/if}
-</div>
 \ No newline at end of file
+</div>