Peter M. Groen / knowledgetree

Commit b9ed22c485151665180149787e2a1bcda162c508

Authored by kevin_fourie
1 parent 4e3b6b8b

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
Inline Side-by-side
Showing 18 changed files with 34 additions and 60 deletions
browse.php
  View file @b9ed22c
... ... @@ -26,10 +26,6 @@
26 26 * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
27 27 * All Rights Reserved.
28 28 * Contributor( s): ______________________________________
29   - *
30   - *
31   - * @version $Revision$
32   - * @author Brad Shuttleworth <brad@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
33 29 */
34 30  
35 31 // main library routines and defaults
... ...
dashboard.php
  View file @b9ed22c
... ... @@ -30,10 +30,6 @@
30 30 * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
31 31 * All Rights Reserved.
32 32 * Contributor( s): ______________________________________
33   - *
34   - *
35   - * @version $Revision$
36   - * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
37 33 */
38 34  
39 35 // main library routines and defaults
... ...
lib/ktentity.inc
  View file @b9ed22c
... ... @@ -28,11 +28,6 @@
28 28 * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
29 29 * All Rights Reserved.
30 30 * Contributor( s): ______________________________________
31   - *
32   - *
33   - * @version $Revision$
34   - * @author Neil Blakey-Milner, Jam Warehouse (Pty) Ltd, South Africa
35   - * @package lib
36 31 */
37 32  
38 33 $_LCASECACHE = array();
... ...
lib/sanitize.inc
  View file @b9ed22c
... ... @@ -28,10 +28,6 @@
28 28 * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
29 29 * All Rights Reserved.
30 30 * Contributor( s): ______________________________________
31   - *
32   - *
33   - * @version $Revision$
34   - * @author Andrew Glen-Young <andrew@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
35 31 */
36 32  
37 33 /**
... ...
plugins/ktcore/KTDocumentActions.php
  View file @b9ed22c
1 1 <?php
2   -
3 2 /**
  3 + * $Id$
4 4 *
5 5 * The contents of this file are subject to the KnowledgeTree Public
6 6 * License Version 1.1.2 ("License"); You may not use this file except in
... ...
plugins/ktcore/admin/roleManagement.php
  View file @b9ed22c
1 1 <?php
2 2 /*
  3 + * $Id$
  4 + *
3 5 * Document Link Type management
4 6 *
5 7 * The contents of this file are subject to the KnowledgeTree Public
... ... @@ -26,11 +28,6 @@
26 28 * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
27 29 * All Rights Reserved.
28 30 * Contributor( s): ______________________________________
29   - *
30   - *
31   - * @version $Revision$
32   - * @author Brad Shuttleworth <brad@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
33   - * @package documentmanagement
34 31 */
35 32  
36 33 require_once(KT_LIB_DIR . '/dispatcher.inc.php');
... ...
resources/css/kt-framing.css
  View file @b9ed22c
... ... @@ -806,31 +806,31 @@ a.main_nav_item {
806 806 margin: 20px auto;
807 807 }
808 808  
809   -.ktErrorMessage {
810   - background-color: #ffdd80;
811   - border: 1px solid #FFC21E;
812   - margin: 20px auto;
813   -}
814   -
815   -.ktErrorMessage p {
  809 +.ktError p {
816 810 margin-left: 20px;
817 811 padding-left: 25px;
818 812 background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat;
819 813 }
820 814  
821   -.ktErrorMessage span {
  815 +.ktError span {
822 816 margin-left: 20px;
823 817 padding-left: 25px;
824 818 background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat;
825 819 }
826 820  
827   -.ktError p {
  821 +.ktErrorMessage {
  822 + background-color: #ffdd80;
  823 + border: 1px solid #FFC21E;
  824 + margin: 20px auto;
  825 +}
  826 +
  827 +.ktErrorMessage p {
828 828 margin-left: 20px;
829 829 padding-left: 25px;
830 830 background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat;
831 831 }
832 832  
833   -.ktError span {
  833 +.ktErrorMessage span {
834 834 margin-left: 20px;
835 835 padding-left: 25px;
836 836 background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat;
... ...
resources/css/kt-login.css
  View file @b9ed22c
... ... @@ -128,20 +128,14 @@
128 128 }
129 129  
130 130 /* block level. */
131   -.ktError {
132   - background: #ffdd80 url(../../resources/graphics/error_toprepeat.png) top left repeat-x;
  131 +.ktErrorMessage {
  132 + background-color: #ffdd80;
133 133 border: 1px solid #FFC21E;
134 134 margin: 20px auto;
135 135 }
136 136  
137   -.ktError p {
138   - margin-left: 20px;
139   - padding-left: 25px;
140   - background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat;
141   -}
142   -
143   -.ktError span {
144   - margin-left: 20px;
  137 +.ktErrorMessage span {
  138 + margin-left: 0px;
145 139 padding-left: 25px;
146 140 background: #ffdd80 url(../../thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat;
147 141 }
... ...
templates/kt3/fieldsets/conditional_editable_values.smarty
  View file @b9ed22c
... ... @@ -2,12 +2,12 @@
2 2 <legend>{$title}</legend>
3 3 <input type="hidden" class="fixed" name="fieldset" value="{$fieldset_id}" />
4 4 {if $context->aError}
5   - <div class="ktError">
6   - <p>
  5 + <div class="ktErrorMessage">
  6 + <span>
7 7 {i18n}The data for this conditional metadata fieldset was not
8 8 completely provided. Provide the extra information, and save your
9 9 changes afterwards.{/i18n}
10   - </p>
  10 + </span>
11 11 </div>
12 12 {/if}
13 13 <p class="descriptiveText">
... ...
templates/ktcore/document/admin/force_checkin_confirm.smarty
  View file @b9ed22c
... ... @@ -16,7 +16,7 @@
16 16 {$checkout_user->getName()}
17 17 </dd>
18 18 {else}
19   - <dd class="ktError">
  19 + <dd class="ktErrorMessage">
20 20 {i18n}The user who checked this document out is no longer valid.{/i18n}
21 21 </dd>
22 22 {/if}
... ...
templates/ktcore/document/cleanup.smarty
  View file @b9ed22c
... ... @@ -9,7 +9,7 @@ which you should investigate.{/i18n}&lt;/p&gt;
9 9 <p class="descriptiveText">{i18n}All paths are relative to your Documents directory.{/i18n}</p>
10 10  
11 11 {if $aFilesToRemove or $aRepoDocumentProblems}
12   -<div class="ktError"><p>{i18n}Warning: Database is inconsistent with the contents of the repository.{/i18n}</p></div>
  12 +<div class="ktErrorMessage"><span>{i18n}Warning: Database is inconsistent with the contents of the repository.{/i18n}</span></div>
13 13  
14 14  
15 15 {if $aRepoDocumentProblems}
... ...
templates/ktcore/help_with_edit.smarty
  View file @b9ed22c
1 1 {if (!$help_body)}
2   -<div class="ktError"><p>{i18n}No content specified for this help file yet. <strong>Edit it first.</strong>{/i18n}</p></div>
  2 +<div class="ktErrorMessage"><span>{i18n}No content specified for this help file yet. <strong>Edit it first.</strong>{/i18n}</span></div>
3 3 {else}
4 4  
5 5 {$context->oPage->requireJSResource("resources/js/help.js")}
... ...
templates/ktcore/login.smarty
  View file @b9ed22c
... ... @@ -30,7 +30,7 @@
30 30 {if ($errorMessage == null)}
31 31 <p class="descriptiveText">{i18n}Please enter your details below to login.{/i18n}</p>
32 32 {else}
33   - <div class="ktError"><p>{$errorMessage}</p></div>
  33 + <div class="ktErrorMessage"><span>{$errorMessage}</span></div>
34 34 {/if}
35 35 <label for="username">{i18n}Username{/i18n}</label>
36 36 <input type="text" id="username" name="username"/>
... ...
templates/ktcore/metadata/conditional/manageConditional.smarty
  View file @b9ed22c
... ... @@ -25,9 +25,9 @@ the issues identified below.{/i18n}&lt;/span&gt;
25 25 {/if}
26 26  
27 27 {if $sIncomplete}
28   -<div class="ktError">
29   -<p>{i18n}This error prevents this fieldset from being set
30   -to complete{/i18n}: {$sIncomplete|escape}</p>
  28 +<div class="ktErrorMessage">
  29 +<span>{i18n}This error prevents this fieldset from being set
  30 +to complete{/i18n}: {$sIncomplete|escape}</span>
31 31 </div>
32 32 {/if}
33 33 {/if}
... ...
templates/ktcore/metadata/editFieldset.smarty
  View file @b9ed22c
1 1 <h2>{i18n}Fieldset{/i18n}: {$oFieldset->getName()|escape}</h2>
2 2  
3 3 {if $sIncomplete}
4   -<div class="ktError">
5   -<p><strong>{i18n}Incomplete{/i18n}: </strong>{i18n}This conditional fieldset cannot be used{/i18n}: <br />
6   -{$sIncomplete|escape}</p>
  4 +<div class="ktErrorMessage">
  5 +<span><strong>{i18n}Incomplete{/i18n}: </strong>{i18n}This conditional fieldset cannot be used{/i18n}: <br />
  6 +{$sIncomplete|escape}</span>
7 7 </div>
8 8 {/if}
9 9  
... ...
templates/ktcore/principals/groupadmin.smarty
  View file @b9ed22c
... ... @@ -72,7 +72,7 @@ href=&quot;{addQS}action=manageSubgroups&amp;group_id={$oGroup-&gt;getId()}&amp;old_search={$old
72 72 </table>
73 73  
74 74 {else}
75   -<div class="ktError"><p>{i18n}No results for your search.{/i18n}</p></div>
  75 +<div class="ktErrorMessage"><span>{i18n}No results for your search.{/i18n}</span></div>
76 76  
77 77 {/if}
78 78 {/if}
... ...
templates/ktcore/principals/useradmin.smarty
  View file @b9ed22c
... ... @@ -122,7 +122,7 @@ very slow if you have many users).{/i18n}&lt;/p&gt;
122 122 </div>
123 123 </form>
124 124 {else}
125   -<div class="ktError"><p>{i18n}No results for your search.{/i18n}</p></div>
  125 +<div class="ktErrorMessage"><span>{i18n}No results for your search.{/i18n}</span></div>
126 126  
127 127 {/if}
128 128 {/if}
... ...
templates/ktstandard/subscriptions/manage.smarty
  View file @b9ed22c
1 1 {if !$aFolderSubscriptions && !$aDocumentSubscriptions}
2   -<div class="ktError">
3   -<p>{i18n}You have no subscriptions{/i18n}</p>
  2 +<div class="ktErrorMessage">
  3 +<span>{i18n}You have no subscriptions{/i18n}</span>
4 4 </div>
5 5 {else}
6 6  
... ...