- add delete-catch patch

- use ktLink in notifications - correct editTransitions - add "important descriptiveText" CSS class. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4781 c91229c3-7414-0410-bfa2-8a42b809f60b

- add delete-catch patch
- use ktLink in notifications - correct editTransitions - add "important descriptiveText" CSS class. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4781 c91229c3-7414-0410-bfa2-8a42b809f60b
bshuttle
1 parent 8184638f
Showing 17 changed files with 54 additions and 22 deletions
lib/templating/kt3template.inc.php
resources/css/kt-framing.css
resources/js/kt-utility.js
templates/kt3/notifications/subscriptions.AddDocument.smarty
templates/kt3/notifications/subscriptions.AddFolder.smarty
templates/kt3/notifications/subscriptions.ArchiveDocument.smarty
templates/kt3/notifications/subscriptions.CheckInDocument.smarty
templates/kt3/notifications/subscriptions.CheckOutDocument.smarty
templates/kt3/notifications/subscriptions.ModifyDocument.smarty
templates/kt3/notifications/subscriptions.MoveDocument.smarty
templates/kt3/notifications/subscriptions.RemoveChildDocument.smarty
templates/kt3/notifications/subscriptions.RemoveChildFolder.smarty
templates/kt3/notifications/subscriptions.RemoveSubscribedDocument.smarty
templates/kt3/notifications/subscriptions.RemoveSubscribedFolder.smarty
templates/kt3/notifications/subscriptions.RestoreDocument.smarty
templates/kt3/notifications/subscriptions.generic.smarty
templates/ktcore/workflow/editTransition.smarty
@@ -59,8 +59,15 @@ class KTPage {
         $this->requireCSSResource("resources/css/kt-ie-icons.css", true);
         /* default js files initialisation */
         $aJS = Array();
+		$aJS[] = 'thirdpartyjs/MochiKit/Base.js';
+		$aJS[] = 'thirdpartyjs/MochiKit/Iter.js';
+		$aJS[] = 'thirdpartyjs/MochiKit/DOM.js';
+		$aJS[] = 'resources/js/kt-utility.js';
         $this->requireJSResources($aJS);
  
+        // this is horrid, but necessary.
+		$this->requireJSStandalone('addLoadEvent(partial(initDeleteProtection, "' . _('Are you sure you wish to delete this item?') . '"));');
+        
         /* menu initialisation*/
         // FIXME:  how do we want to handle the menu?
         $this->initMenu();
@@ -293,6 +293,11 @@ a.main_nav_item {
     color: #666;
 }
  
+#content .descriptiveText.important {
+    padding-left: 25px;
+    color: black;
+    background: transparent  url(../../thirdparty/icon-theme/16x16/status/dialog-information.png) center left no-repeat;
+}
  
  
  
+/*
+ * general utility functions for KT
+ */
+ 
+function confirmDelete(message) { return confirm(message); } 
+ 
+function initDeleteProtection(message) {
+    var fn = partial(confirmDelete, message);
+    var elements = getElementsByTagAndClassName('A','ktDelete');
+    
+    function setClickFunction(fn, node) {
+        // addToCallStack(node,'onClick',fn);
+        if (isUndefinedOrNull(node.onclick)) { 
+            node.onclick = fn;
+        }
+    }
+    
+    forEach(elements, partial(setClickFunction, fn));
+    
+}
 \ No newline at end of file
@@ -3,7 +3,7 @@
 <!-- could break this up. -->
     The document "{$info.object_name}" was added{if ($info.location_name !== null)} to "{$info.location_name}"{/if}.
     <div class="actionoptions">
-    <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}">{i18n}Read Document{/i18n}</a> | 
-    <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}&notify_action=clear">{i18n}Clear Alert{/i18n}</a>
+    <a href="{ktLink base="notify.php" query="id=`$info.notify_id`"}">{i18n}Read Document{/i18n}</a> | 
+    <a href={ktLink base="notify.php" query="`$info.notify_id`&notify_action=clear"}">{i18n}Clear Alert{/i18n}</a>
     </div>
 </dd>
@@ -3,7 +3,7 @@
 <!-- could break this up. -->
     The folder "{$info.object_name}" was added{if ($info.location_name !== null)} to "{$info.location_name}"{/if}.
     <div class="actionoptions">
-    <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}">{i18n}View New Folder{/i18n}</a> | 
-    <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}&notify_action=clear">{i18n}Clear Alert{/i18n}</a>
+    <a href="{ktLink base="notify.php" query="id=`$info.notify_id`"}">{i18n}View New Folder{/i18n}</a> | 
+    <a href={ktLink base="notify.php" query="id=`$info.notify_id`&notify_action=clear"}">{i18n}Clear Alert{/i18n}</a>
     </div>
 </dd>
@@ -3,6 +3,6 @@
 <!-- could break this up. -->
     The document "{$info.object_name}" has been archived by an administrator.
     <div class="actionoptions">    
-        <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}&notify_action=clear">{i18n}Clear Alert{/i18n}</a>
+        <a href={ktLink base="notify.php" query="id=`$info.notify_id`&notify_action=clear"}">{i18n}Clear Alert{/i18n}</a>
     </div>
 </dd>
@@ -3,7 +3,7 @@
 <!-- could break this up. -->
     The document "{$info.object_name}" has been checked in, in the folder "{$info.location_name}".
     <div class="actionoptions">    
-        <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}">{i18n}View Document{/i18n}</a>
-        <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}&notify_action=clear">{i18n}Clear Alert{/i18n}</a>
+        <a href="{ktLink base="notify.php" query="id=`$info.notify_id`"}">{i18n}View Document{/i18n}</a>
+        <a href={ktLink base="notify.php" query="id=`$info.notify_id`&notify_action=clear"}">{i18n}Clear Alert{/i18n}</a>
     </div>
 </dd>
@@ -3,7 +3,7 @@
 <!-- could break this up. -->
     The document "{$info.object_name}" has been checked out, in the folder "{$info.location_name}".
     <div class="actionoptions">    
-        <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}">{i18n}View Document{/i18n}</a>
-        <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}&notify_action=clear">{i18n}Clear Alert{/i18n}</a>
+        <a href="{ktLink base="notify.php" query="id=`$info.notify_id`"}">{i18n}View Document{/i18n}</a>
+        <a href={ktLink base="notify.php" query="id=`$info.notify_id`&notify_action=clear"}">{i18n}Clear Alert{/i18n}</a>
     </div>
 </dd>
@@ -3,7 +3,7 @@
 <!-- could break this up. -->
     The document "{$info.object_name}" has been changed in the folder "{$info.location_name}".
     <div class="actionoptions">    
-        <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}">{i18n}View Document{/i18n}</a>
-        <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}&notify_action=clear">{i18n}Clear Alert{/i18n}</a>
+        <a href="{ktLink base="notify.php" query="id=`$info.notify_id`"}">{i18n}View Document{/i18n}</a>
+        <a href={ktLink base="notify.php" query="id=`$info.notify_id`&notify_action=clear"}">{i18n}Clear Alert{/i18n}</a>
     </div>
 </dd>
@@ -3,7 +3,7 @@
 <!-- could break this up. -->
     The document "{$info.object_name}" has been moved to the folder "{$info.location_name}".
     <div class="actionoptions">    
-        <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}">{i18n}View New Location{/i18n}</a>
-        <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}&notify_action=clear">{i18n}Clear Alert{/i18n}</a>
+        <a href="{ktLink base="notify.php" query="id=`$info.notify_id`"}">{i18n}View New Location{/i18n}</a>
+        <a href={ktLink base="notify.php" query="id=`$info.notify_id`&notify_action=clear"}">{i18n}Clear Alert{/i18n}</a>
     </div>
 </dd>
@@ -3,7 +3,7 @@
 <!-- could break this up. -->
     The document "{$info.object_name}" has been removed from the folder "{$info.location_name}", to which you are subscribed.
     <div class="actionoptions">    
-        <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}">{i18n}View Folder{/i18n}</a>
-        <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}&notify_action=clear">{i18n}Clear Alert{/i18n}</a>
+        <a href="{ktLink base="notify.php" query="id=`$info.notify_id`"}">{i18n}View Folder{/i18n}</a>
+        <a href={ktLink base="notify.php" query="id=`$info.notify_id`&notify_action=clear"}">{i18n}Clear Alert{/i18n}</a>
     </div>
 </dd>
@@ -3,7 +3,7 @@
 <!-- could break this up. -->
     The folder "{$info.object_name}" was removed{if ($info.location_name !== null)} from "{$info.location_name}"{/if}.
     <div class="actionoptions">
-    <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}">{i18n}View Folder{/i18n}</a> | 
-    <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}&notify_action=clear">{i18n}Clear Alert{/i18n}</a>
+    <a href="{ktLink base="notify.php" query="id=`$info.notify_id`"}">{i18n}View Folder{/i18n}</a> | 
+    <a href={ktLink base="notify.php" query="id=`$info.notify_id`&notify_action=clear"}">{i18n}Clear Alert{/i18n}</a>
     </div>
 </dd>
@@ -3,6 +3,6 @@
 <!-- could break this up. -->
     The document "{$info.object_name}" to which you were subscribed, has been removed.
     <div class="actionoptions">    
-        <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}&notify_action=clear">{i18n}Clear Alert{/i18n}</a>
+        <a href={ktLink base="notify.php" query="id=`$info.notify_id`&notify_action=clear"}">{i18n}Clear Alert{/i18n}</a>
     </div>
 </dd>
@@ -3,6 +3,6 @@
 <!-- could break this up. -->
     The folder "{$info.object_name}" to which you were subscribed, was removed.
     <div class="actionoptions">    
-    <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}&notify_action=clear">{i18n}Clear Alert{/i18n}</a>
+    <a href={ktLink base="notify.php" query="id=`$info.notify_id`&notify_action=clear"}">{i18n}Clear Alert{/i18n}</a>
     </div>
 </dd>
@@ -3,6 +3,6 @@
 <!-- could break this up. -->
     The document "{$info.object_name}" has been restored by an administrator.
     <div class="actionoptions">    
-        <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}&notify_action=clear">{i18n}Clear Alert{/i18n}</a>
+        <a href={ktLink base="notify.php" query="id=`$info.notify_id`&notify_action=clear"}">{i18n}Clear Alert{/i18n}</a>
     </div>
 </dd>
 <dt class="actionitem subscription">{$info.title}</dt>
 <dd class="actionmessage">
     <div class="actionoptions">
-    <a href="{$absoluteRootUrl}/notify.php?id={$info.notify_id}&notify_action=clear">{i18n}Clear Alert{/i18n}</a>
+    <a href="{ktLink base="notify.php" query="id=`$info.notify_id`&notify_action=clear"}">{i18n}Clear Alert{/i18n}</a>
     </div>
 </dd>
@@ -5,7 +5,7 @@
 <fieldset>
 <legend>{i18n}Edit transition properties{/i18n}</legend>
  
-<p class="helpText">{i18n}Select the target state of the transition, and
+<p class="descriptiveText">{i18n}Select the target state of the transition, and
 select the permission, group, and/or role necessary to perform the
 transition.  Selecting more than one of permission, group, or role will
 require that the user wishing to perform the transition fulfil every