diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2016-08-09 11:29:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-09 11:29:31 +0200 |
| commit | c04b0364acecc3b9c9bf5ee37d0e7db5b5b5234a (patch) | |
| tree | ae321faeae34492cab5562b8c1debc7ade78f28e | |
| parent | b4ed4e152e9853fe85492b10986f9923e703da73 (diff) | |
| parent | 94ac627c379f858ac27ad529dd86776344e9707c (diff) | |
| download | nextcloud-server-c04b0364acecc3b9c9bf5ee37d0e7db5b5b5234a.tar.gz nextcloud-server-c04b0364acecc3b9c9bf5ee37d0e7db5b5b5234a.zip | |
Merge pull request #750 from nextcloud/workflow-cleanup
Workflow cleanup
| -rw-r--r-- | apps/workflowengine/css/admin.css | 6 | ||||
| -rw-r--r-- | apps/workflowengine/templates/admin.php | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/apps/workflowengine/css/admin.css b/apps/workflowengine/css/admin.css index 70185615ad6..5494b35ce69 100644 --- 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 index 935e8c70f17..ea4168b0ff9 100644 --- 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}} |