Merged in from DEV trunk...

KTS-2002 "UI has multiple issues related to it. " Fixed. Added ktError changes. Reviewed By: Conrad git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@6655 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from DEV trunk...
KTS-2002 "UI has multiple issues related to it. " Fixed. Added ktError changes. Reviewed By: Conrad git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@6655 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent 4e3b6b8b
Showing 18 changed files with 34 additions and 60 deletions
browse.php
dashboard.php
lib/ktentity.inc
lib/sanitize.inc
plugins/ktcore/KTDocumentActions.php
plugins/ktcore/admin/roleManagement.php
resources/css/kt-framing.css
resources/css/kt-login.css
templates/kt3/fieldsets/conditional_editable_values.smarty
templates/ktcore/document/admin/force_checkin_confirm.smarty
templates/ktcore/document/cleanup.smarty
templates/ktcore/help_with_edit.smarty
templates/ktcore/login.smarty
templates/ktcore/metadata/conditional/manageConditional.smarty
templates/ktcore/metadata/editFieldset.smarty
templates/ktcore/principals/groupadmin.smarty
templates/ktcore/principals/useradmin.smarty
templates/ktstandard/subscriptions/manage.smarty
@@ -26,10 +26,6 @@
  * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
  * All Rights Reserved.
  * Contributor( s): ______________________________________
- *
- *
- * @version $Revision$
- * @author Brad Shuttleworth <brad@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
  */
 // main library routines and defaults
@@ -30,10 +30,6 @@
  * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
  * All Rights Reserved.
  * Contributor( s): ______________________________________
- *
- *
- * @version $Revision$
- * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
  */
 // main library routines and defaults
@@ -28,11 +28,6 @@
  * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
  * All Rights Reserved.
  * Contributor( s): ______________________________________
- *
- *
- * @version $Revision$
- * @author Neil Blakey-Milner, Jam Warehouse (Pty) Ltd, South Africa
- * @package lib
  */
 $_LCASECACHE = array();
@@ -28,10 +28,6 @@
  * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
  * All Rights Reserved.
  * Contributor( s): ______________________________________
- *
- *
- * @version $Revision$
- * @author Andrew Glen-Young <andrew@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
  */
 /**
 <?php
-
 /**
+ * $Id$
  *
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /*
+ * $Id$
+ *
  * Document Link Type management
  *
  * The contents of this file are subject to the KnowledgeTree Public
@@ -26,11 +28,6 @@
  * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
  * All Rights Reserved.
  * Contributor( s): ______________________________________
- *
- *
- * @version $Revision$
- * @author Brad Shuttleworth <brad@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
- * @package documentmanagement
  */
 require_once(KT_LIB_DIR . '/dispatcher.inc.php');
@@ -806,31 +806,31 @@ a.main_nav_item {
     margin: 20px auto;
 }
-.ktErrorMessage {
-	background-color: #ffdd80;
-    border: 1px solid #FFC21E;
-    margin: 20px auto;
-}
-
-.ktErrorMessage p {
+.ktError p {
     margin-left: 20px;
     padding-left: 25px;
     background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat;
 }
-.ktErrorMessage span {
+.ktError span {
     margin-left: 20px;
     padding-left: 25px;
     background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat;
 }
-.ktError p {
+.ktErrorMessage {
+	background-color: #ffdd80;
+    border: 1px solid #FFC21E;
+    margin: 20px auto;
+}
+
+.ktErrorMessage p {
     margin-left: 20px;
     padding-left: 25px;
     background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat;
 }
-.ktError span {
+.ktErrorMessage span {
     margin-left: 20px;
     padding-left: 25px;
     background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat;
@@ -128,20 +128,14 @@
 }
 /* block level. */
-.ktError {
-	background: #ffdd80 url(../../resources/graphics/error_toprepeat.png) top left repeat-x;
+.ktErrorMessage {
+	background-color: #ffdd80;
     border: 1px solid #FFC21E;
     margin: 20px auto;
 }
-.ktError p {
-    margin-left: 20px;
-    padding-left: 25px;
-    background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat;
-}
-
-.ktError span {
-    margin-left: 20px;
+.ktErrorMessage span {
+    margin-left: 0px;
     padding-left: 25px;
     background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat;
 }
@@ -2,12 +2,12 @@
     <legend>{$title}</legend>
     <input type="hidden" class="fixed" name="fieldset" value="{$fieldset_id}" />
     {if $context->aError}
-    <div class="ktError">
-    <p>
+    <div class="ktErrorMessage">
+    <span>
 	{i18n}The data for this conditional metadata fieldset was not
 completely provided.  Provide the extra information, and save your
 changes afterwards.{/i18n}
-    </p>
+    </span>
     </div>
     {/if}
     <p class="descriptiveText">
@@ -16,7 +16,7 @@
       {$checkout_user->getName()}
    </dd>
    {else}
-   <dd class="ktError">
+   <dd class="ktErrorMessage">
       {i18n}The user who checked this document out is no longer valid.{/i18n}
    </dd>
    {/if}
@@ -9,7 +9,7 @@ which you should investigate.{/i18n}&lt;/p&gt;
 <p class="descriptiveText">{i18n}All paths are relative to your Documents directory.{/i18n}</p>
 {if $aFilesToRemove or $aRepoDocumentProblems}
-<div class="ktError"><p>{i18n}Warning:  Database is inconsistent with the contents of the repository.{/i18n}</p></div>
+<div class="ktErrorMessage"><span>{i18n}Warning:  Database is inconsistent with the contents of the repository.{/i18n}</span></div>
 {if $aRepoDocumentProblems}
 {if (!$help_body)}
-<div class="ktError"><p>{i18n}No content specified for this help file yet. <strong>Edit it first.</strong>{/i18n}</p></div>
+<div class="ktErrorMessage"><span>{i18n}No content specified for this help file yet. <strong>Edit it first.</strong>{/i18n}</span></div>
 {else}
 {$context->oPage->requireJSResource("resources/js/help.js")}
@@ -30,7 +30,7 @@
 			        {if ($errorMessage == null)}
 					    <p class="descriptiveText">{i18n}Please enter your details below to login.{/i18n}</p>
 					{else}
-					    <div class="ktError"><p>{$errorMessage}</p></div>
+					    <div class="ktErrorMessage"><span>{$errorMessage}</span></div>
 					{/if}
 		        	<label for="username">{i18n}Username{/i18n}</label>
 					<input type="text" id="username" name="username"/>
@@ -25,9 +25,9 @@ the issues identified below.{/i18n}&lt;/span&gt;
 {/if}
 {if $sIncomplete}
-<div class="ktError">
-<p>{i18n}This error prevents this fieldset from being set
-to complete{/i18n}: {$sIncomplete|escape}</p>
+<div class="ktErrorMessage">
+<span>{i18n}This error prevents this fieldset from being set
+to complete{/i18n}: {$sIncomplete|escape}</span>
 </div>
 {/if}
 {/if}
 <h2>{i18n}Fieldset{/i18n}: {$oFieldset->getName()|escape}</h2>
 {if $sIncomplete}
-<div class="ktError">
-<p><strong>{i18n}Incomplete{/i18n}: </strong>{i18n}This conditional fieldset cannot be used{/i18n}: <br />
-{$sIncomplete|escape}</p>
+<div class="ktErrorMessage">
+<span><strong>{i18n}Incomplete{/i18n}: </strong>{i18n}This conditional fieldset cannot be used{/i18n}: <br />
+{$sIncomplete|escape}</span>
 </div>
 {/if}
@@ -72,7 +72,7 @@ href=&quot;{addQS}action=manageSubgroups&amp;group_id={$oGroup-&gt;getId()}&amp;old_search={$old
 </table>
 {else}
-<div class="ktError"><p>{i18n}No results for your search.{/i18n}</p></div>
+<div class="ktErrorMessage"><span>{i18n}No results for your search.{/i18n}</span></div>
 {/if}
 {/if}
@@ -122,7 +122,7 @@ very slow if you have many users).{/i18n}&lt;/p&gt;
 </div>
 </form>
 {else}
-<div class="ktError"><p>{i18n}No results for your search.{/i18n}</p></div>
+<div class="ktErrorMessage"><span>{i18n}No results for your search.{/i18n}</span></div>
 {/if}
 {/if}
 {if !$aFolderSubscriptions && !$aDocumentSubscriptions}
-<div class="ktError">
-<p>{i18n}You have no subscriptions{/i18n}</p>
+<div class="ktErrorMessage">
+<span>{i18n}You have no subscriptions{/i18n}</span>
 </div>
 {else}