Merge pull request #1762 from nextcloud/backports/1760/stable25

[stable25] fix: hide upload button on public album shares

js/photos-src_components_FilesPicker_vue.js.LICENSE.txt

@@ -0,0 +1,21 @@
+/**
+ * @copyright Copyright (c) 2022 Louis Chemineau <louis@chmn.me>
+ *
+ * @author Louis Chemineau <louis@chmn.me>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */

js/photos-src_mixins_FetchFilesMixin_js-src_components_Collection_CollectionContent_vue.js.LICENSE.txt

@@ -0,0 +1,43 @@
+/**
+ * @copyright Copyright (c) 2019 John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * @copyright Copyright (c) 2022 Louis Chemineau <louis@chmn.me>
+ *
+ * @author Louis Chemineau <louis@chmn.me>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */

src/views/PublicAlbumContent.vue

@@ -2,6 +2,7 @@
  - @copyright Copyright (c) 2022 Louis Chemineau <louis@chmn.me>
  -
  - @author Louis Chemineau <louis@chmn.me>
+ - @author Richard Steinmetz <richard@steinmetz.cloud>
  -
  - @license AGPL-3.0-or-later
  -
@@ -72,15 +73,17 @@
 			<NcEmptyContent slot="empty-content"
 				:title="t('photos', 'This album does not have any photos or videos yet!')"
 				class="album__empty">
-				<ImagePlus slot="icon" />
+				<ImageOff slot="icon" />
 
+				<!-- Public upload is not implemented yet
 				<NcButton slot="action"
 					type="primary"
 					:aria-label="t('photos', 'Add photos to this album')"
 					@click="showAddPhotosModal = true">
 					<Plus slot="icon" />
 					{{ t('photos', "Add") }}
 				</NcButton>
+				-->
 			</NcEmptyContent>
 		</CollectionContent>
 	</div>
@@ -91,12 +94,13 @@ import { mapActions, mapGetters } from 'vuex'
 import { createClient, getPatcher } from 'webdav'
 
 import MapMarker from 'vue-material-design-icons/MapMarker'
-import Plus from 'vue-material-design-icons/Plus'
-import ImagePlus from 'vue-material-design-icons/ImagePlus'
+// import Plus from 'vue-material-design-icons/Plus'
+// import ImagePlus from 'vue-material-design-icons/ImagePlus'
+import ImageOff from 'vue-material-design-icons/ImageOff'
 // import Download from 'vue-material-design-icons/Download'
 // import DownloadMultiple from 'vue-material-design-icons/DownloadMultiple'
 
-import { NcActions, NcButton, NcEmptyContent, /** NcActionSeparator, */ isMobile } from '@nextcloud/vue'
+import { NcActions, /** NcButton, */ NcEmptyContent, /** NcActionSeparator, */ isMobile } from '@nextcloud/vue'
 import { showError } from '@nextcloud/dialogs'
 import axios from '@nextcloud/axios'
 import { generateUrl, generateRemoteUrl } from '@nextcloud/router'
@@ -123,14 +127,15 @@ export default {
 	name: 'PublicAlbumContent',
 	components: {
 		MapMarker,
-		Plus,
+		// Plus,
 		// Download,
 		// DownloadMultiple,
-		ImagePlus,
+		// ImagePlus,
+		ImageOff,
 		NcEmptyContent,
 		NcActions,
 		// NcActionSeparator,
-		NcButton,
+		// NcButton,
 		CollectionContent,
 		// ActionDownload,
 		HeaderNavigation,