Merge pull request #1656 from nextcloud/bugfix/noid/command-interface…

…-finish Add a description to the commands admin settings
nextcloud · Apr 2, 2019 · f3bf14b · f3bf14b
2 parents 9808645 + 2c2b6b4
commit f3bf14b
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 3 deletions.
diff --git a/css/settings-admin.scss b/css/settings-admin.scss
@@ -47,6 +47,14 @@
 
 
 .commands.section {
+	.icon-beta-feature {
+		@include icon-color('customization', 'categories', $color-warning, 1, true);
+	}
+
+	p.settings-hint > a {
+		text-decoration: underline !important;
+	}
+
 	#commands_list {
 		display: grid;
 		grid-template-columns: minmax(100px, 200px) minmax(100px, 200px)  1fr minmax(100px, 200px)  minmax(100px, 200px);

diff --git a/js/admin/commands.js b/js/admin/commands.js
diff --git a/js/admin/commands.js.map b/js/admin/commands.js.map
diff --git a/lib/Chat/Command/Executor.php b/lib/Chat/Command/Executor.php
@@ -126,6 +126,10 @@ protected function execHelp(Room $room, IComment $message, string $arguments): s
 			}
 		}
 
+		if (empty($helps)) {
+			return $this->l->t('There are currently no commands available.');
+		}
+
 		// FIXME Implement a useful help
 		return implode("\n", $helps);
 	}

diff --git a/vue/src/views/Commands.vue b/vue/src/views/Commands.vue
@@ -22,7 +22,15 @@
 
 <template>
 	<div id="chat_commands" class="commands section">
-		<h2>{{ t('spreed', 'Commands') }}</h2>
+		<h2>
+			{{ t('spreed', 'Commands') }}
+			<small>
+				{{ t('spreed', 'Beta') }}
+				<span class="icon icon-beta-feature" />
+			</small>
+		</h2>
+
+		<p class="settings-hint" v-html="commandHint" />
 
 		<div id="commands_list">
 			<div class="head name">
@@ -61,6 +69,14 @@ export default {
 		}
 	},
 
+	computed: {
+		commandHint() {
+			return t('spreed', 'Commands are a new beta feature in Nextcloud Talk. They allow you to run scripts on your Nextcloud server. You can define them with our command line interface. An example of a calculator script can be found in our <a {attributes}>documentation ↗</a>.', {
+				attributes: 'target="_blank" rel="noreferrer noopener" href="https://github.com/nextcloud/spreed/blob/master/docs/commands.md"'
+			}, undefined, { escape: false })
+		}
+	},
+
 	mounted() {
 		this.commands = OCP.InitialState.loadState('talk', 'commands')
 	}
@@ -80,5 +96,17 @@ export default {
 			font-weight: bold;
 		}
 	}
+	small {
+		color: var(--color-warning);
+		border: 1px solid var(--color-warning);
+		border-radius: 16px;
+		padding: 0 9px;
+
+		.icon {
+			width: 16px;
+			height: 16px;
+			margin-bottom: 4px;
+		}
+	}
 }
 </style>