Merge pull request nextcloud#750 from nextcloud/workflow-cleanup

Workflow cleanup
GitHubUser4234 · Aug 9, 2016 · 9a1e9c7 · 9a1e9c7
2 parents 3b06b31 + 546db82
commit 9a1e9c7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/apps/workflowengine/css/admin.css b/apps/workflowengine/css/admin.css
@@ -1,5 +1,7 @@
 .workflowengine .operation {
 	padding: 5px;
+	padding-bottom: 20px;
+	margin-bottom: 20px;
 	border-bottom: #eee 1px solid;
 	border-left: rgba(0,0,0,0) 1px solid;
 }
@@ -28,6 +30,10 @@
 	transition: opacity .5s;
 }
 
+.workflowengine .operation .check:hover {
+	background-color: #f8f8f8;
+}
+
 .workflowengine .operation .button-delete,
 .workflowengine .operation .button-delete-check {
 	opacity: 0.5;

diff --git a/apps/workflowengine/templates/admin.php b/apps/workflowengine/templates/admin.php
@@ -24,14 +24,19 @@
 ?>
 <div id="<?php p($_['appid']); ?>" class="section workflowengine">
 	<h2 class="inlineblock"><?php p($_['heading']); ?></h2>
+
+	<?php if ($_['description']): ?>
+		<p><?php p($_['description']); ?></p>
+	<?php endif; ?>
+
 	<script type="text/template" id="operations-template">
 		<div class="operations"></div>
-		<button class="button-add-operation"><?php p($l->t('Add operation')); ?></button>
+		<button class="button-add-operation"><?php p($l->t('Add rule group')); ?></button>
 	</script>
 
 	<script type="text/template" id="operation-template">
 		<div class="operation{{#if hasChanged}} modified{{/if}}">
-			<input type="text" class="operation-name" value="{{operation.name}}">
+			<input type="text" class="operation-name" placeholder="<?php p($l->t('Short rule description')); ?>" value="{{operation.name}}">
 			{{! delete only makes sense if the operation is already saved }}
 			{{#if operation.id}}
 			<span class="button-delete pull-right icon-delete"></span>
@@ -56,7 +61,7 @@
 				</div>
 				{{/each}}
 			</div>
-			<button class="button-add"><?php p($l->t('Add check')); ?></button>
+			<button class="button-add"><?php p($l->t('Add rule')); ?></button>
 			{{#if hasChanged}}
 				{{! reset only makes sense if the operation is already saved }}
 				{{#if operation.id}}