Skip to content

NMC-533 Set new folder name inline: rebased #31396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
skjnldsv wants to merge 6 commits into from
Closed

NMC-533 Set new folder name inline: rebased #31396

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4e448ba
Implementation of Add button folder creation and Add button text docu…
TSI-kavitasonawane Aug 30, 2021
65cc112
Prevents the sidebar from being shown when creating a new directory
TSI-kavitasonawane Jan 11, 2022
5436522
Fix template picker styling with new Modal size
skjnldsv Mar 2, 2022
4d0e9d5
Adjust acceptance tests to changes in new folder creation
danxuliu Apr 18, 2022
9d3a932
Adjust acceptance tests to details view state after creating folder
danxuliu Apr 19, 2022
6629a07
Compile assets
nextcloud-command Apr 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix template picker styling with new Modal size 
Signed-off-by: John Molakvoæ <[email protected]>
  • Loading branch information
@skjnldsv @szaimen
skjnldsv authored and szaimen committed Apr 19, 2022
commit 5436522c0b26b017a062d4dc74e2287cdf34aa7d
3 changes: 2 additions & 1 deletion apps/files/js/newfilemenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,9 @@
var self = this;
var newname = $target.attr('data-templatename');
var action = _.filter(self._menuItems, function(item) {
return item.id == $target.attr('data-action');
return item.id == $target.attr('data-action');
}).pop();

action.actionHandler(newname);
OC.hideMenus();
},
Expand Down
20 changes: 16 additions & 4 deletions apps/files/src/views/TemplatePicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,19 @@
</template>

<script>
import { normalize } from 'path'
import { showError } from '@nextcloud/dialogs'
import { generateOcsUrl } from '@nextcloud/router'
import axios from '@nextcloud/axios'
import EmptyContent from '@nextcloud/vue/dist/Components/EmptyContent'
import Modal from '@nextcloud/vue/dist/Components/Modal'

import { getCurrentDirectory } from '../utils/davUtils'
import { createFromTemplate, getTemplates } from '../services/Templates'
import { getTemplates } from '../services/Templates'
import TemplatePreview from '../components/TemplatePreview'

const border = 2
const margin = 8
const width = margin * 20
const width = margin * 18

export default {
name: 'TemplatePicker',
Expand Down Expand Up @@ -214,6 +215,7 @@ export default {
const options = _.extend({ scrollTo: true }, { showDetailsView: false } || {})
await fileList?.addAndFetchFileInfo(this.name, undefined, options)
fileList.rename(this.name)

this.close()
} catch (error) {
this.logger.error('Error while creating the new file from template')
Expand All @@ -233,6 +235,11 @@ export default {
padding: calc(var(--margin) * 2);
// Will be handled by the buttons
padding-bottom: 0;
// Dynamix height content
display: flex;
flex-direction: column;
height: 100%;
box-sizing: border-box;

h2 {
text-align: center;
Expand All @@ -252,6 +259,11 @@ export default {
grid-auto-rows: 1fr;
// Center the columns set
justify-content: center;
// Fit max size and grow, scroll if necessary
flex: 1 1 100%;
height: 100%;
min-height: 0;
overflow-y: auto;
}

&__buttons {
Expand Down Expand Up @@ -279,7 +291,7 @@ export default {
justify-content: center;
width: 100%;
height: 100%;
margin: 0;
margin: 0 !important;
background-color: var(--color-main-background-translucent);
}
}
Expand Down