Pico CMS for Nextcloud v1.1 (WIP)

Makefile

@@ -129,6 +129,8 @@ build: lazy-check clean-build composer
 		--exclude="/*.phar" \
 		--exclude=".git" \
 		./ "$(build_dir)/$(app_name)/"
+	cp "./vendor/picocms/pico/plugins/DummyPlugin.php" \
+		"$(build_dir)/$(app_name)/appdata/plugins/DummyPlugin.php"
 	tar cfz "$(build_dir)/$(archive)" \
 		-C "$(build_dir)" "$(app_name)"
 

appdata/plugins/.gitignore

@@ -1,2 +1,3 @@
 # You should add plugins installed by Composer here
 /PicoDeprecated
+/DummyPlugin.php

appinfo/info.xml

@@ -23,7 +23,7 @@ You want to learn more about Pico CMS for Nextcloud? Easy! Just download and ena
 
 ]]>
 	</description>
-	<version>1.0.17</version>
+	<version>1.1.0-beta.1</version>
 	<licence>agpl</licence>
 	<author homepage="https://github.com/daita">Maxence Lange</author>
 	<author homepage="https://github.com/PhrozenByte">Daniel Rudolf</author>

appinfo/routes.php

@@ -87,6 +87,7 @@
 		[ 'name' => 'Plugins#addCustomPlugin', 'url' => '/admin/plugins', 'verb' => 'POST' ],
 		[ 'name' => 'Plugins#updateCustomPlugin', 'url' => '/admin/plugins/{item}', 'verb' => 'POST' ],
 		[ 'name' => 'Plugins#removeCustomPlugin', 'url' => '/admin/plugins/{item}', 'verb' => 'DELETE' ],
+		[ 'name' => 'Plugins#copyDummyPlugin', 'url' => '/admin/plugins/DummyPlugin', 'verb' => 'CLONE' ],
 
 		[ 'name' => 'Settings#setLimitGroups', 'url' => '/admin/limit_groups', 'verb' => 'POST' ],
 		[ 'name' => 'Settings#setLinkMode', 'url' => '/admin/link_mode', 'verb' => 'POST' ],

composer.json

@@ -39,5 +39,10 @@
     "pico-plugin-dir": "appdata/plugins/"
   },
   "minimum-stability": "beta",
-  "prefer-stable": true
+  "prefer-stable": true,
+  "config": {
+    "allow-plugins": {
+      "picocms/*": true
+    }
+  }
 }

css/pico.scss

@@ -139,6 +139,12 @@
 		}
 	}
 
+	.dialog-hint {
+		margin-top: -2px;
+		margin-bottom: calc(var(--margin));
+		opacity: 0.7;
+	}
+
 	table.table {
 		width: 100%;
 		border: 1px solid var(--color-border);
@@ -181,6 +187,10 @@
 					flex: 1 1 auto;
 				}
 
+				> .name-edit {
+					display: none;
+				}
+
 				> .actions,
 				> .more {
 					flex: 0 0 auto;
@@ -367,6 +377,17 @@
 		max-width: 37.5em;
 	}
 
+	.has-input-icon {
+		display: inline-block;
+		padding-right: 32px;
+	}
+
+	.input-icon {
+		margin: 4px 4px 4px -36px;
+		padding: 16px;
+		cursor: pointer;
+	}
+
 	p {
 		margin-bottom: calc(var(--margin) * 0.5);
 		text-align: justify;
@@ -534,6 +555,8 @@
  * @license https://fontawesome.com/license/free
  */
 :root {
+	--icon-edit-000: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB3aWR0aD0iMTUuNzUiIGhlaWdodD0iMTQiPjxwYXRoIGQ9Ik00MDIuNiA4My4ybDkwLjIgOTAuMmMzLjggMy44IDMuOCAxMCAwIDEzLjhMMjc0LjQgNDA1LjZsLTkyLjggMTAuM2MtMTIuNCAxLjQtMjIuOS05LjEtMjEuNS0yMS41bDEwLjMtOTIuOEwzODguOCA4My4yYzMuOC0zLjggMTAtMy44IDEzLjggMHptMTYyLTIyLjlsLTQ4LjgtNDguOGMtMTUuMi0xNS4yLTM5LjktMTUuMi01NS4yIDBsLTM1LjQgMzUuNGMtMy44IDMuOC0zLjggMTAgMCAxMy44bDkwLjIgOTAuMmMzLjggMy44IDEwIDMuOCAxMy44IDBsMzUuNC0zNS40YzE1LjItMTUuMyAxNS4yLTQwIDAtNTUuMnpNMzg0IDM0Ni4yVjQ0OEg2NFYxMjhoMjI5LjhjMy4yIDAgNi4yLTEuMyA4LjUtMy41bDQwLTQwYzcuNi03LjYgMi4yLTIwLjUtOC41LTIwLjVINDhDMjEuNSA2NCAwIDg1LjUgMCAxMTJ2MzUyYzAgMjYuNSAyMS41IDQ4IDQ4IDQ4aDM1MmMyNi41IDAgNDgtMjEuNSA0OC00OFYzMDYuMmMwLTEwLjctMTIuOS0xNi0yMC41LTguNWwtNDAgNDBjLTIuMiAyLjMtMy41IDUuMy0zLjUgOC41eiIvPjwvc3ZnPgoK);
+	--icon-edit-fff: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB3aWR0aD0iMTUuNzUiIGhlaWdodD0iMTQiPjxwYXRoIGQ9Ik00MDIuNiA4My4ybDkwLjIgOTAuMmMzLjggMy44IDMuOCAxMCAwIDEzLjhMMjc0LjQgNDA1LjZsLTkyLjggMTAuM2MtMTIuNCAxLjQtMjIuOS05LjEtMjEuNS0yMS41bDEwLjMtOTIuOEwzODguOCA4My4yYzMuOC0zLjggMTAtMy44IDEzLjggMHptMTYyLTIyLjlsLTQ4LjgtNDguOGMtMTUuMi0xNS4yLTM5LjktMTUuMi01NS4yIDBsLTM1LjQgMzUuNGMtMy44IDMuOC0zLjggMTAgMCAxMy44bDkwLjIgOTAuMmMzLjggMy44IDEwIDMuOCAxMy44IDBsMzUuNC0zNS40YzE1LjItMTUuMyAxNS4yLTQwIDAtNTUuMnpNMzg0IDM0Ni4yVjQ0OEg2NFYxMjhoMjI5LjhjMy4yIDAgNi4yLTEuMyA4LjUtMy41bDQwLTQwYzcuNi03LjYgMi4yLTIwLjUtOC41LTIwLjVINDhDMjEuNSA2NCAwIDg1LjUgMCAxMTJ2MzUyYzAgMjYuNSAyMS41IDQ4IDQ4IDQ4aDM1MmMyNi41IDAgNDgtMjEuNSA0OC00OFYzMDYuMmMwLTEwLjctMTIuOS0xNi0yMC41LTguNWwtNDAgNDBjLTIuMiAyLjMtMy41IDUuMy0zLjUgOC41eiIgZmlsbD0iI2ZmZiIvPjwvc3ZnPgoK);
 	--icon-lock-000: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0NDggNTEyIiB3aWR0aD0iMTIuMjUiIGhlaWdodD0iMTQiPjxwYXRoIGQ9Ik00MDAgMjI0aC0yNHYtNzJDMzc2IDY4LjIgMzA3LjggMCAyMjQgMFM3MiA2OC4yIDcyIDE1MnY3Mkg0OGMtMjYuNSAwLTQ4IDIxLjUtNDggNDh2MTkyYzAgMjYuNSAyMS41IDQ4IDQ4IDQ4aDM1MmMyNi41IDAgNDgtMjEuNSA0OC00OFYyNzJjMC0yNi41LTIxLjUtNDgtNDgtNDh6bS0xMDQgMEgxNTJ2LTcyYzAtMzkuNyAzMi4zLTcyIDcyLTcyczcyIDMyLjMgNzIgNzJ2NzJ6Ii8+PC9zdmc+);
 	--icon-lock-fff: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0NDggNTEyIiB3aWR0aD0iMTIuMjUiIGhlaWdodD0iMTQiPjxwYXRoIGQ9Ik00MDAgMjI0aC0yNHYtNzJDMzc2IDY4LjIgMzA3LjggMCAyMjQgMFM3MiA2OC4yIDcyIDE1MnY3Mkg0OGMtMjYuNSAwLTQ4IDIxLjUtNDggNDh2MTkyYzAgMjYuNSAyMS41IDQ4IDQ4IDQ4aDM1MmMyNi41IDAgNDgtMjEuNSA0OC00OFYyNzJjMC0yNi41LTIxLjUtNDgtNDgtNDh6bS0xMDQgMEgxNTJ2LTcyYzAtMzkuNyAzMi4zLTcyIDcyLTcyczcyIDMyLjMgNzIgNzJ2NzJ6IiBmaWxsPSIjZmZmIi8+PC9zdmc+);
 	--icon-lock-open-000: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB3aWR0aD0iMTUuNzUiIGhlaWdodD0iMTQiPjxwYXRoIGQ9Ik00MjMuNSAwQzMzOS41LjMgMjcyIDY5LjUgMjcyIDE1My41VjIyNEg0OGMtMjYuNSAwLTQ4IDIxLjUtNDggNDh2MTkyYzAgMjYuNSAyMS41IDQ4IDQ4IDQ4aDM1MmMyNi41IDAgNDgtMjEuNSA0OC00OFYyNzJjMC0yNi41LTIxLjUtNDgtNDgtNDhoLTQ4di03MS4xYzAtMzkuNiAzMS43LTcyLjUgNzEuMy03Mi45IDQwLS40IDcyLjcgMzIuMSA3Mi43IDcydjgwYzAgMTMuMyAxMC43IDI0IDI0IDI0aDMyYzEzLjMgMCAyNC0xMC43IDI0LTI0di04MEM1NzYgNjggNTA3LjUtLjMgNDIzLjUgMHoiLz48L3N2Zz4=);
@@ -548,6 +571,13 @@
 	--icon-copy-fff: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0NDggNTEyIiB3aWR0aD0iMTIuMjUiIGhlaWdodD0iMTQiPjxwYXRoIGZpbGw9ImN1cnJlbnRDb2xvciIgZD0iTTMyMCA0NDh2NDBjMCAxMy4yNTUtMTAuNzQ1IDI0LTI0IDI0SDI0Yy0xMy4yNTUgMC0yNC0xMC43NDUtMjQtMjRWMTIwYzAtMTMuMjU1IDEwLjc0NS0yNCAyNC0yNGg3MnYyOTZjMCAzMC44NzkgMjUuMTIxIDU2IDU2IDU2aDE2OHptMC0zNDRWMEgxNTJjLTEzLjI1NSAwLTI0IDEwLjc0NS0yNCAyNHYzNjhjMCAxMy4yNTUgMTAuNzQ1IDI0IDI0IDI0aDI3MmMxMy4yNTUgMCAyNC0xMC43NDUgMjQtMjRWMTI4SDM0NGMtMTMuMiAwLTI0LTEwLjgtMjQtMjR6bTEyMC45NzEtMzEuMDI5TDM3NS4wMjkgNy4wMjlBMjQgMjQgMCAwIDAgMzU4LjA1OSAwSDM1MnY5Nmg5NnYtNi4wNTlhMjQgMjQgMCAwIDAtNy4wMjktMTYuOTd6IiBmaWxsPSIjZmZmIj48L3BhdGg+PC9zdmc+);
 }
 
+.icon-edit {
+	background-image: var(--icon-edit-000);
+}
+.icon-edit-white, .icon-edit.icon-white {
+	background-image: var(--icon-edit-fff);
+}
+
 .icon-lock {
 	background-image: var(--icon-lock-000);
 }

js/admin.js

@@ -50,6 +50,9 @@
 	 * @lends OCA.CMSPico.AdminList.prototype
 	 */
 	OCA.CMSPico.AdminList.prototype = $.extend({}, OCA.CMSPico.List.prototype, {
+		/** @member {Object[]|string[]} */
+		staticItems: [],
+
 		/** @member {Object[]|string[]} */
 		systemItems: [],
 
@@ -59,6 +62,9 @@
 		/** @member {Object[]|string[]} */
 		newItems: [],
 
+		/** @member {jQuery} */
+		$staticTemplate: $(),
+
 		/** @member {jQuery} */
 		$systemTemplate: $(),
 
@@ -78,6 +84,7 @@
 		 * @param {Object}        [options]
 		 * @param {string}        [options.route]
 		 * @param {jQuery|string} [options.template]
+		 * @param {jQuery|string} [options.staticTemplate]
 		 * @param {jQuery|string} [options.systemTemplate]
 		 * @param {jQuery|string} [options.customTemplate]
 		 * @param {jQuery|string} [options.newTemplate]
@@ -89,12 +96,14 @@
 			OCA.CMSPico.List.prototype.initialize.apply(this, arguments);
 
 			options = $.extend({
+				staticTemplate: $element.data('staticTemplate'),
 				systemTemplate: $element.data('systemTemplate'),
 				customTemplate: $element.data('customTemplate'),
 				newTemplate: $element.data('newTemplate'),
 				copyTemplate: $element.data('copyTemplate')
 			}, options);
 
+			this.$staticTemplate = $(options.staticTemplate);
 			this.$systemTemplate = $(options.systemTemplate);
 			this.$customTemplate = $(options.customTemplate);
 			this.$newTemplate = $(options.newTemplate);
@@ -107,6 +116,42 @@
 			if (!this.$customTemplate.length) {
 				throw signature + ': No valid custom item template given';
 			}
+
+			this._initStaticItems();
+		},
+
+		/**
+		 * @protected
+		 */
+		_initStaticItems: function () {
+			var $content = this.$staticTemplate.octemplate() || $(),
+				filter = this.$staticTemplate.data('filter') || '*',
+				that = this;
+
+			this.staticItems = [];
+			$content.filter(filter).each(function () {
+				var $itemTemplate = $(this),
+					itemData = {};
+
+				if (that.$staticTemplate.data('replaces')) {
+					$itemTemplate.data('replaces', that.$staticTemplate.data('replaces'));
+				}
+				if (that.$staticTemplate.data('appendTo')) {
+					$itemTemplate.data('appendTo', that.$staticTemplate.data('appendTo'));
+				}
+
+				$.each($itemTemplate.data(), function (key, value) {
+					if (key.substr(0, 4) === 'item') {
+						key = key[4].toLowerCase() + key.substr(5);
+						itemData[key] = value;
+					}
+				});
+
+				that.staticItems.push({
+					'$itemTemplate': $itemTemplate,
+					'itemData': itemData
+				});
+			});
 		},
 
 		/**
@@ -126,19 +171,24 @@
 
 			this._content(this.$template);
 
-			$.each(data.systemItems, function (_, value) {
+			$.each(this.staticItems, function (_, data) {
+				var $item = that._content(data.$itemTemplate, data.itemData);
+				that._setupItem($item, data.itemData);
+			});
+
+			$.each(this.systemItems, function (_, value) {
 				var itemData = (typeof value === 'object') ? value : { name: value },
 					$item = that._content(that.$systemTemplate, itemData);
 				that._setupItem($item, itemData);
 			});
 
-			$.each(data.customItems, function (_, value) {
+			$.each(this.customItems, function (_, value) {
 				var itemData = (typeof value === 'object') ? value : { name: value },
 					$item = that._content(that.$customTemplate, itemData);
 				that._setupItem($item, itemData);
 			});
 
-			$.each(data.newItems, function (_, value) {
+			$.each(this.newItems, function (_, value) {
 				var itemData = (typeof value === 'object') ? value : { name: value },
 					$item = that._content(that.$newTemplate, itemData);
 				that._setupItem($item, itemData);
@@ -157,15 +207,13 @@
 
 			if ($newItem.val()) {
 				$newItemButton.on('click.CMSPicoAdminList', function (event) {
-					event.preventDefault();
 					that._api('POST', '', { item: $newItem.val() });
 				});
 			} else {
 				$newItemButton.add($newItem).prop('disabled', true);
 			}
 
 			this.$element.find('.action-reload').on('click.CMSPicoAdminList', function (event) {
-				event.preventDefault();
 				that.reload();
 			});
 		},
@@ -209,7 +257,6 @@
 			});
 
 			$item.find('.action-sync').on('click.CMSPicoAdminList', function (event) {
-				event.preventDefault();
 				that._api('POST', itemData.name);
 			});
 
@@ -238,13 +285,11 @@
 				});
 
 				$this.on('click.CMSPicoAdminList', function (event) {
-					event.preventDefault();
 					dialog.open();
 				});
 			});
 
 			$item.find('.action-delete').on('click.CMSPicoAdminList', function (event) {
-				event.preventDefault();
 				that._api('DELETE', itemData.name);
 			});
 		}