Merged from STABLE trunk...

KTS-1779 "UI issue on workflow action page. " Fixed. Reviewed By: Conrad KTS-1779 "Error with interface when deleting a workflow state. " Fixed. Reviewed By: Kevin, Conrad git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.3.3-Release-Branch@6377 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged from STABLE trunk...
KTS-1779 "UI issue on workflow action page. " Fixed. Reviewed By: Conrad KTS-1779 "Error with interface when deleting a workflow state. " Fixed. Reviewed By: Kevin, Conrad git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.3.3-Release-Branch@6377 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent 8663bd68
Showing 4 changed files with 144 additions and 37 deletions
plugins/ktcore/KTDocumentViewlets.php
plugins/ktcore/admin/workflowsv2.php
resources/css/kt-framing.css
templates/ktcore/workflow/admin/actions_overview.smarty
@@ -47,6 +47,9 @@ class KTWorkflowViewlet extends KTDocumentViewlet {
         }
         foreach ($aTransitions as $oTransition) {
+        	if(is_null($oTransition) || PEAR::isError($oTransition)){
+            	continue;
+            }
             $aDisplayTransitions[] = array(
                 'url' => KTUtil::ktLink('action.php', 'ktcore.actions.document.workflow', array("fDocumentId" => $this->oDocument->getId(), "action" => "quicktransition", "fTransitionId" => $oTransition->getId())),
                 'name' => $oTransition->getName(),
@@ -893,6 +893,8 @@ class KTWorkflowAdminV2 extends KTAdminDispatcher {
             'context' => $this,
         ));
         $other_states = sprintf('id != %d', $this->oState->getId());
+        $other_states .= sprintf(' AND workflow_id = %d', $this->oWorkflow->getId());
+       
         $oForm->setWidgets(array(
             array('ktcore.widgets.entityselection', array(
                 'vocab' => KTWorkflowState::getList($other_states),
@@ -32,6 +32,16 @@ body
     border-top: 1px solid #ccc;
 }
+.action_overview_scroll {
+	border:1px ;
+	overflow: auto;
+	width: 80%;
+	height: 450px;
+	position: absolute;
+	top:100; 
+	left:100;
+}
+
 #pageBody {
     position: relative;
     border: 1px solid white;
@@ -1224,14 +1234,15 @@ a.main_nav_item {
 .ktBlock { 
-    padding: 0 1em;
-    border: 1px solid #c5c5c5;
-    background-color: #fcfcfc;
-    margin: 0.5em 0;
+    padding: 0.1em 1em;
+    /*border-right: 1px solid #c5c5c5;*/
+    /*background-color: #fcfcfc;*/
+    margin: 1em 0;
+    position:relative;
 }
-.ktBlock, .ktInfo, .ktError { 
+.ktInfo, .ktError { 
     background-repeat: repeat-x;
     background-position: top left;
 }
@@ -1244,14 +1255,12 @@ a.main_nav_item {
     background-image: url(../../resources/graphics/dashlet-gradient-error.gif);
 }
-#dashboard-container-left .ktBlock,
 #dashboard-container-left .ktInfo,
 #dashboard-container-left .ktError,
-#dashboard-container-right .ktBlock,
 #dashboard-container-right .ktInfo,
 #dashboard-container-right .ktError 
 { 
-    -moz-border-radius: 15px; 
+    -moz-border-radius: 15px;
 }
 #dashboardBox {
     width: 80%
@@ -1281,6 +1290,12 @@ a.main_nav_item {
     margin: 0.5em;
 }
+.outerContainer{
+	height: 450px;
+	overflow: auto;
+    margin-bottom: 20px;
+}
+
 /* ========== kt actions 
 These are used to mark up various different "actions" (e.g. cut, copy, delete).
@@ -1404,73 +1419,139 @@ The text will be hidden for screen view.  The generic fahrner-ish approach comes
 /*     background-color: #ddf; */
 }
-#dashboard_block_topleft {
+.dashboard_block_topleft {
     position: absolute;
-    width: 40px;
-    height: 40px;
+    width: 35px;
+    height: 36px;
     top: 0px;
     left: 0px;
+    background: url(../graphics/dashlet_topleft.png) top left no-repeat;
+    z-index:-1;
 }
-#dashboard_block_toprepeat {
+.dashboard_block_toprepeat {
     position: absolute;
-    width: 95%;
-    height: 3px;
+    width: 90%;
+    height: 36px;
     top: 0px;
     left: 30px;
+    background: white url(../graphics/dashlet_toprepeat.png) top left repeat-x;
+    z-index:-1;
 }
-#dashboard_block_topright {
+.dashboard_block_topright {
     position: absolute;
-    width: 40px;
-    height: 40px;
+    width: 35px;
+    height: 36px;
     top: 0px;
     right: 0px;
+    background: url(../graphics/dashlet_topright.png) top right no-repeat;
+    z-index:-1;
 }
-#dashboard_block_leftrepeat {
+.dashboard_block_leftrepeat_top {
     position: absolute;
-    width: 3px;
-    height: 95%;
-    top: 30px;
+    width: 13px;
+    height: 50%;
+    top: 5px;
     left: 0px;
+    background: white url(../graphics/dashlet_leftrepeat.png) top left repeat-y;
+    z-index:-1;
 }
-#dashboard_block_bottomleft {
+.dashboard_block_leftrepeat_bottom {
+    position: absolute;
+    width: 13px;
+    height: 50%;
+    bottom: 10px;
+    left: 0px;
+    background: white url(../graphics/dashlet_leftrepeat.png) top left repeat-y;
+    z-index:-1;
+}
+
+.dashboard_block_bottomleft {
     position: absolute;
     width: 40px;
     height: 40px;
     bottom: 0px;
     left: 0px;
+    background: url(../graphics/dashlet_bottomleft.png) bottom left no-repeat;
+    z-index:-1;
 }
-#dashboard_block_bottomrepeat {
+.dashboard_block_bottomrepeat {
     position: absolute;
-    width: 95%;
-    height: 3px;
+    width: 90%;
+    height: 13px;
     bottom: 0px;
     left: 30px;
+    background: white url(../graphics/dashlet_bottomrepeat.png) bottom left repeat-x;
+    z-index:-1;
 }
-#dashboard_block_bottomright {
+.dashboard_block_bottomright {
     position: absolute;
     width: 40px;
     height: 40px;
     bottom: 0px;
     right: 0px;
+    background: url(../graphics/dashlet_bottomright.png) bottom right no-repeat;
+    z-index:-1;
 }
-#dashboard_block_rightrepeat {
+.dashboard_block_rightrepeat_top {
     position: absolute;
-    width: 3px;
-    height: 95%;
-    top: 30px;
+    width: 13px;
+    height: 50%;
+    top: 5px;
     right: 0px;
+    background: white url(../graphics/dashlet_rightrepeat.png) top right repeat-y;
+    z-index:-1;
+    overflow:hidden;
+}
+
+.dashboard_block_rightrepeat_bottom {
+    position: absolute;
+    width: 13px;
+    height: 50%;
+    bottom: 10px;
+    right: 0px;
+    background: white url(../graphics/dashlet_rightrepeat.png) bottom right repeat-y;
+    z-index:-1;
+    overflow:hidden;
+}
+
+.dashboard_block_rightrepeat_top {
+    min-height: 70px;
+}
+
+.dashboard_block.rolled-up .dashboard_block_rightrepeat_top
+{ 
+    display: none;
+}
+
+.dashboard_block.rolled-up .dashboard_block_rightrepeat_bottom
+{ 
+    display: none;
+}
+
+.dashboard_block.rolled-up .dashboard_block_leftrepeat_top
+{ 
+    display: none;
+}
+
+.dashboard_block.rolled-up .dashboard_block_leftrepeat_bottom
+{ 
+    display: none;
 }
 .dashboard_block {
     width: 100%;
-/*     background-color: #fdd; */
+    /*background-color: #fdd;*/
+}
+
+.dashboard_block_empty{
+	border:none;
 }
 #copyrightbarBorder {
@@ -1724,13 +1805,15 @@ hr {
 { 
     float: right;
     text-align: right;
-    margin: 0.75em 0em 0 0;
+    margin: 0.2em 0em 0 0;
     z-index: 100;
 }
 .dashboard_block_handle
 { 
     cursor: pointer;
+    margin: 0.2em -0.5em 0.5em 0;
+    font-size:small;
 }
 .dashboard_block.rolled-up .dashboard_block_body
@@ -1738,9 +1821,17 @@ hr {
     display: none;
 }
-.dashboard_block .dashboard_block_body 
+.ktBlock .dashboard_block_body
+{ 
+    z-index:99;
+    margin: 8px 0 10px 0;
+    background-color:#FFFFFF;
+}
+
+.dashboard_block .dashboard_block_body  .edit_action 
 { 
     z-index:99;
+    background-color:#FFFFFF;
 }
 /* actions */
@@ -1777,9 +1868,15 @@ hr {
 #content .dashboard_block.rolled-up h2 
 { 
     border-bottom-width: 0px;
-    padding-bottom: 0px;
+    padding-bottom: 10px;
 }
+#content .ktBlock h2 
+{ 
+    border-bottom-width: 0px;
+    color: #FFFFFF;
+    font-size: small;
+}
 #content .dashboard_block.closed 
 { 
@@ -6,12 +6,14 @@ which are not blocked are still controlled by the usual permissions.{/i18n}&lt;/p&gt;
 <p><a class="ktAction ktActionDescribed ktEdit" href="{addQS context=$context}action=editactions{/addQS}">{i18n}Edit Actions{/i18n}</a>
 <a href="{addQS context=$context}action=editactions{/addQS}">{i18n}Edit Actions{/i18n}</a></p>
-
-<table class="kt_collection narrow" cellspacing="0">
+<div class="action_overview_scroll">
+<table class="kt_collection narrow" width="50" cellspacing="0">
     <thead>
         <th>{i18n}State{/i18n}</th>
       {foreach from=$actions item=oAction}
-        <th>{$oAction->getDisplayName()}</th>  
+      	{if ($oAction->getDisplayName() != '')}
+        <th>{$oAction->getDisplayName()}</th> 
+        {/if} 
       {/foreach}
     </thead>
@@ -21,14 +23,17 @@ which are not blocked are still controlled by the usual permissions.{/i18n}&lt;/p&gt;
         <tr>
             <td>{$oState->getName()}</td>
             {foreach from=$actions item=oAction}
+            {if ($oAction->getDisplayName() != '')}
             {assign value=$oAction->getName() var=action_id}
               {if $grid.$state_id.$action_id}
                 <td class="centered"><span class="ktAction ktDenied">{i18n}Denied{/i18n}</span></td>              
               {else}
                 <td class="centered">&mdash;</td>
               {/if}
+            {/if}
             {/foreach}
         </tr>
       {/foreach}
     </tbody>
 </table>
+</div>