Don't close folder menu on modal pop up

services/web/app/views/modals.jade

@@ -1,113 +0,0 @@
-#archiveEntityModal(style='display: none')
-	.modal
-		.modal-header
-			h3 Delete Project
-		.modal-body
-			span.message Are you sure you want to delete 
-				strong.name Project
-				| ?
-		.modal-footer
-			button.btn.btn-danger.confirm Delete
-			button.btn.cancel No
-
-#deleteEntityModal(style='display: none')
-	.modal
-		.modal-header
-			h3 Delete Project
-		.modal-body
-			p Are you sure you want to delete 
-				strong.name Project
-				| ? 
-
-			p
-				strong It will not be possible to recover your project once deleted.
-		.modal-footer
-			button.btn.btn-danger.confirm Delete Forever
-			button.btn.cancel No
-
-#renameProjectModal(style='display: none')
-	.modal
-		.modal-header
-			h3 Rename Project
-		.modal-body
-			form.form-horizontal(onkeydown="if (event.keyCode == 13){event.preventDefault(); document.getElementById('confirmRename').click()}")
-				input.inputmodal#projectNewName(placeholder='name')
-		.modal-footer
-			button.btn.btn-primary#confirmRename Rename
-			button.btn.cancel Cancel
-
-#leaveProjectModal(style='display: none')
-	.modal
-		.modal-header
-			h3 Leave Project
-		.modal-body
-			span.message Are you sure you want to leave 
-				strong.name Project
-				| ?
-		.modal-footer
-			button.btn.btn-danger.confirm Leave
-			button.btn.cancel No
-
-#deleteUserAccountModal(style='display: none')
-	.modal
-		.modal-header
-			h3 Delete Account
-		.modal-body
-			span.message Type 
-				strong Delete 
-				| below to confirm you want to delete your account forever
-			div  
-			input.inputmodal(placeholder='')
-		.modal-footer
-			button.btn.btn-danger#confirmDeleteUser Delete Forever
-			button.btn.cancel Cancel
-
-#cloneProjectModal(style='display: none')
-	.modal
-		.modal-header
-			h3 Clone Project
-		.modal-body
-			form.form-horizontal(onkeydown="if (event.keyCode == 13){event.preventDefault(); document.getElementById('confirmCloneProject').click()}")
-				input.inputmodal#newProjectName(placeholder='New Name')
-		.modal-footer
-			button.btn.btn-primary#confirmCloneProject Create
-			button.btn.cancel Cancel
-
-#newProjectModal(style='display: none')
-	.modal
-		.modal-header
-			h3 New Project
-		.modal-body
-			form.form-horizontal(onkeydown="if (event.keyCode == 13){event.preventDefault(); document.getElementById('confirmNewProject').click()}")
-				input.inputmodal#newProjectName(placeholder='name')
-		.modal-footer
-			button.btn.btn-primary#confirmNewProject Create
-			button.btn.cancel Cancel
-
-#newEntityModal(style='display: none')
-	.modal
-		.modal-header
-			h3 
-		.modal-body
-			form.form-horizontal(onkeydown="if (event.keyCode == 13){event.preventDefault(); $('.in button#genericSave').click()}")
-				input.inputmodal.span3(placeholder='name')
-		.modal-footer
-			button.btn.btn-primary#genericSave.confirm Save
-			button.btn.cancel Cancel
-
-
-#errorModal(style='display: none')
-	.modal
-		.modal-header
-			h3
-		.modal-body
-			span.message
-
-#projectUploadModal(style='display: none')
-	.modal
-		.modal-header
-			h3 Upload Zipped Project
-		.modal-body#projectFileUpload
-			span Upload a zipped project
-		.modal-footer
-			button.btn.cancel Cancel

services/web/app/views/project/list/modals.jade

@@ -9,13 +9,20 @@ script(type='text/ng-template', id='newTagModalTemplate')
 				required,
 				ng-model="inputs.newTagName",
 				on-enter="create()",
-				focus-on="open"
+				focus-on="open",
+				stop-propagation="click"
 			)
 	.modal-footer
-		button.btn.btn-default(ng-click="cancel()") Cancel
+		//- We stop propagation to stop the clicks from closing the
+		//- 'move to folder' menu.
+		button.btn.btn-default(
+			ng-click="cancel()"
+			stop-propagation="click"
+		) Cancel
 		button.btn.btn-primary(
 			ng-disabled="newTagForm.$invalid"
 			ng-click="create()"
+			stop-propagation="click"
 		) Create
 
 script(type='text/ng-template', id='renameProjectModalTemplate')

services/web/app/views/templates.jade

@@ -1,495 +0,0 @@
-#templates(style='display : none')
-
-	script(type="text/template")#editorLayoutTemplate
-		div#mainSplitter
-			aside#sidebar.ui-layout-west
-				//input#search-field(type='search', placeholder='Filter Files by Name')
-				// Position:relative is to get scrolling while dragging to work:
-				// http://stackoverflow.com/questions/1718547/jquery-draggable-scroll-not-working-when-helper-clone-is-used
-				#sections(style="position: relative;")
-				#options
-					span#saving-area 
-
-			#content.content.ui-layout-center
-				#loading.fullEditorArea
-				#disconnect(style='display: none;').fullEditorArea
-					#mainAreaMessage Sorry, your browser has lost the connection to our server. Please try refreshing the page.
-				#projectDeleted(style='display: none;').fullEditorArea
-					#mainAreaMessage This project has been renamed or deleted.
-				#folderArea(style='display: none;').fullEditorArea
-				#imageArea(style='display: none;').fullEditorArea
-					iframe
-		
-	script(type="text/template")#tabTemplate
-		li(id="{{ id }}-tab-li")
-			a(href="#", data-toggle="tab", data-target="\\#{{ show }}-tab", class="tab-link {{ id }}-tab")
-				.content {{ name }}
-
-	script(type="text/template")#tabContentTemplate
-		div.tab-pane(id="{{ id }}-tab")
-
-	script(type="text/template")#fileTreeTemplate
-		.file-tree.js-file-tree
-
-	script(type="text/template")#fileTreeActionsTemplate
-		.actions
-			.new-entity.dropdown.js-new-entity-menu
-				a.dropdown-toggle(href="#", data-toggle="dropdown", title="New file, folder or upload")
-					i.icon-plus
-					span.text New
-				ul.dropdown-menu
-					li
-						a.js-new-file(href="#")
-							img(src="/img/nide/doc.png")
-							| New File
-					li
-						a.js-new-folder(href="#")
-							img(src="/img/nide/folder.png")
-							| New Folder
-					li
-						a.js-upload-file(href="#")
-							img(src="/img/upload-file.png")
-							| Upload file(s)
-			.js-rename-btn.rename-btn
-				a(href="#", title="Rename")
-					i.icon-pencil
-			.js-delete-btn.delete-btn
-				a(href="#", title="Delete")
-					i.icon-trash
-
-	script(type="text/template")#rootDocListEntity
-		option {{name}}
-
-	script(type="text/template")#entityTemplate
-		.entity-list-item(class="entity-{{ type }}", entity-type="{{ type }}", id="{{ id }}")
-			.clickable.js-clickable
-				i(class="sprite-{{ type }}")
-				span.name {{ name }}
-				input.rename.js-rename
-			.dropdown-caret
-				i.icon-chevron-down
-			.entity-label.label.label-success
-
-	script(type="text/template")#folderTemplate
-		.entity-list-item(class="entity-{{ type }}", entity-type="{{ type }}", id="{{ id }}")
-			.toggle.js-toggle
-				img(src="/img/nide/right-arrow.png").js-closed
-				img(src="/img/nide/down-arrow.png").js-open
-			.clickable.js-clickable
-				i(class="sprite-{{ type }}")
-				span.name {{ name }}
-				input.rename.js-rename
-			.dropdown-caret
-				i.icon-chevron-down
-			.entity-label.label.label-success
-
-	script(type="text/template")#deletedDocsFolderTemplate
-		.entity-list-item.entity-deleted-docs-folder(class="entity-{{ type }}", entity-type="{{ type }}", id="{{ id }}")
-			.clickable.js-clickable
-				span.name {{ name }}
-			.entity-label.label.label-success
-	
-	script(type="text/template")#entityListTemplate
-		.contents
-			.entity-list(id="{{ id }}-file-list")
-
-	script(type="text/template")#newEntityModalTemplate
-		div
-			input.inputmodal(placeholder="name")
-	
-	script(type="text/template")#messageTemplate
-		.chatMessage
-			span.name {{name}}
-			span :
-			span.message {{message}}
-
-	script(type="text/template")#spellingMenuTemplate
-		div.btn-group.spell-check-menu
-			a.btn.dropdown-toggle(data-toggle="dropdown", href="#")
-				span.underlined Ab
-			ul.dropdown-menu.pull-right
-				li.divider
-				li
-					a#learnWord(href="#") Learn word
-
-	script(type="text/template")#spellingMenuEntryTemplate
-		li.spelling-suggestion
-			a(href="#") {{word}}
-
-	script(type="text/template")#contextMenuTemplate
-		ul.dropdown-menu.context-menu
-
-	script(type="text/template")#contextMenuEntryTemplate
-		li
-			a(href="#") {{text}}
-
-	script(type="text/template")#contextMenuDividerTemplate
-		li.divider
-	
-	script(type="text/template")#genericModalTemplate
-		.modal
-			.modal-header
-				h3 {{ title }}
-			.modal-body
-				.message {{{ message }}}
-				.creditCardFreeTrialModal
-			.modal-footer
-
-
-	script(type="text/template")#creditCardFreeTrialModal
-		.modal
-			.modal-header
-				h3 {{ title }}
-			.modal-body
-				#subscribeForm
-			.modal-footer
-
-	script(type="text/template")#genericModalButtonTemplate
-		button(class="btn {{ class }}") {{ text }}
-
-	script(type="text/template")#editorPanelTemplate
-		#editorArea(style='display: none;')
-			#editorSplitter
-				#leftEditorPanel.ui-layout-center
-					#editorWrapper
-						#editor
-						#undoConflictWarning(style="display: none")
-							| <strong>Watch out!</strong> We had to undo some of your collaborators changes before we could undo yours.
-							a(href="#").js-hide Hide
-				#rightEditorPanel.ui-layout-east
-
-	script(type="text/template")#loadingIndicatorTemplate
-		.loading
-
-	script(type="text/template")#pdfSideBarLinkTemplate
-		ul
-			li.root.project#pdf(title='Show PDF', alt='pdf')
-				img(src='/img/pdf.png') 
-				span PDF
-	
-	script(type="text/template")#helpLinkTemplate
-		div
-			a(href="#", title="LaTeX Help") LaTeX Help
-
-	script(type="text/template")#editorTourTemplate
-		div
-			a(href="#", title="Editor Tour")#editorTourLink Editor Tour
-
-	script(type="text/template")#pdfPanelTemplate
-		#pdfArea(style='display: none;').fullEditorArea
-			#pdfToolBar.btn-toolbar
-				.btn-group
-					button#recompilePdf.btn.btn-success(type='button') Recompile
-				.btn-group#showLogGroup
-					button#showLog.btn Logs
-				.btn-group#showPdfGroup
-					button#showPdf.btn Back to PDF
-				.btn-group
-					button#downloadPdf.btn Download
-					button#downloadLinksButton.btn.dropdown-toggle(data-toggle="dropdown")
-						span.caret
-					ul.dropdown-menu
-						#downloadLinks
-						li.divider
-						li.delete-cached-files
-							a(href="#") Clear cached files
-				.btn-group.pull-right(data-toggle="buttons-radio")
-					button(type="button", title="Flat view")#flatViewButton.btn
-						i.icon-flatview
-					button(type="button", title="Split view")#splitViewButton.btn
-						i.icon-splitview
-			#pdfAreaContent
-				.not-compiled-yet-message
-					| Click here to preview your work as a PDF.
-				.compiling-message(style='display: none;') Compiling...
-				#logArea(style='display: none;')
-					ul
-					button.btn.btn-info.btn-large#showRawLog Show Raw Logs
-				#rawLogArea(style='display: none;')
-					pre
-
-	script(type="text/template")#syncButtonsTemplate
-		div.sync-buttons
-			button.btn.sync-code-to-pdf &rarr;
-			button.btn.sync-pdf-to-code &larr;
-
-	script(type="text/template")#outputFileLinkTemplate
-		li
-			a(href="/project/{{ project_id }}/output/{{ path }}", target="_blank") Download {{ name }}
-
-	script(type="text/template")#pdfjsViewerTemplate
-		.pdfjs-viewer
-			.pdfjs-list-view
-			.btn-group
-				button.btn.btn-info.js-fit-height
-					img(src="/img/iconshock/fit-to-height.png")
-				button.btn.btn-info.js-fit-width
-					img(src="/img/iconshock/fit-to-width.png")
-				button.btn.btn-info.js-zoom-out
-					img(src="/img/iconshock/zoom-out.png")
-				button.btn.btn-info.js-zoom-in
-					img(src="/img/iconshock/zoom-in.png")
-			.progress.progress-info
-				.bar
-				span Loading
-
-	script(type="text/template")#compileSuccessTemplate
-		li.alert.alert-success
-			strong No errors. 
-			span Great Job!
-	
-	script(type="text/template")#compileErrorTemplate
-		li.alert.alert-error
-			p
-				strong Server Error. 
-				span Sorry, something went wrong and the project could not be compiled. Please try again in a few moments.
-			p
-				| If the problem persists, try 
-				a(href='#').js-clear-cache clearing the cache.
-				|  If that doesn't work, please contact support.
-	script(type="text/template")#compileFailedTemplate
-		li.alert.alert-error
-			p
-				strong Compile Error. 
-				span Sorry, your LaTeX code couldn't compile for some reason. Please check the errors below for details, or view the raw log.
-			p
-				| If the problem persists, try 
-				a(href='#').js-clear-cache clearing the cache.
-	script(type="text/template")#compileTimeoutTemplate
-		li.alert.alert-error
-			strong Timed out. 
-			span Sorry, your compile was taking too long and timed out.
-				| This may be due to a large number of high-res images, or lots of complicated diagrams. 
-				| Please try to make your document simpler, or contact support for help.
-	script(type="text/template")#compileLogEntryTemplate
-		li.alert.clickable(class="alert-{{ type }}")
-			strong {{ title }}: 
-			span {{ message }}
-			.small {{ content }}
-
-	script(type="text/template")#projectMemberListTemplate
-		table.table
-			thead
-				tr
-					th Email
-					th Privileges
-					th
-			tbody
-		!= '{{#showAdminControls}}'
-		form.well.form-inline.addUserForm
-			input(type="email",placeholder="someone@email.com")#newEmail.email.input-large
-			select.privileges.input-medium
-				option(value="readAndWrite") Read and write
-				option(value="readOnly") Read Only
-			button.btn.btn-primary.addUser Add New Collaborator
-		!= '{{/showAdminControls}}'
-
-	script(type="text/template")#projectMemberListItemTemplate
-		tr.projectMember
-			td.email!= '{{ email }}'
-			td.privileges!= '{{ privileges }}'
-			td
-				!= '{{#showRemove}}'
-				button(href="#").btn.btn-danger.removeUser Remove
-				!= '{{/showRemove}}'
-
-	script(type="text/template")#socialSharingTemplate
-		.box
-			.page-header
-				h2 Share Publicly
-			div.share-button
-				a.btn.btn-twitter.btn-large(href="#")
-					i.icon-twitter
-					| &nbsp; Share on Twitter
-			div.share-button
-				.btn.btn-facebook.btn-large
-					i.icon-facebook
-					| &nbsp; Share on Facebook
-			div.share-button
-				.btn.btn-google-plus.btn-large
-					i.icon-google-plus
-					| &nbsp; Share on Google+
-			div.share-button
-				.btn.btn-large.btn-url
-					i.icon-link
-					| &nbsp; Share URL
-
-
-	script(type="text/template")#publishProjectTemplate
-		.box
-			.page-header
-				h2 Publish project as template
-				
-			#publishedAsTemplateArea.show-when-published.alert.alert-success
-				p
-					.btn.btn-warning#unPublishProjectAsTemplate.pull-right Unpublish
-					i.icon-ok 
-					|  Your project is currently published. 
-					a#templateLink(href='{{canonicalUrl}}') View in template gallery.
-				p
-					| Lastest version: {{publishedDate}}. 
-
-			#problemWithPublishingArea
-				p There is a problem with our publishing service, please try again in a few minutes.
-			#publishWorkingArea
-				p Working...
-			div.show-when-published.show-when-unpublished.project-description
-				label(for="project-description") Description
-				.row-fluid
-					textarea(placeholder="Template description", name="project-description").span12#projectDescription {{description}}
-			#unpublishedAsTemplateArea.show-when-unpublished
-				.btn.btn-success#publishProjectAsTemplate Publish
-			p.show-when-published
-				button.btn.btn-success#republishProjectAsTemplate Re-Publish
-
-
-	script(type="text/template")#settingsPanelTemplate
-		.fullEditorArea.projectSettings
-			include project/partials/manage
-
-	script(type="text/template")#userPanelTemplate
-		.fullEditorArea.projectSettings
-			.box
-				.page-header      
-					h2 Share Privately (via email)
-				#projectMembersList
-			#socialSharing
-			#publishProject
-
-	script(type='text/template')#fileViewTemplate
-		!= '{{#image}}'
-		div
-			img(src='{{ previewUrl }}')
-		!= '{{/image}}'
-		!= '{{^image}}'
-		.no-preview No preview available :(
-		!= '{{/image}}'
-		a(href='{{ downloadUrl }}', target="_blank").download.btn.btn-large!= 'Download {{ name }}'
-
-	script(type='text/template')#hotKeysLinkTemplate
-		div
-			a(href="#", title='Show Hot Keys List')#hotkeysLink Hot keys
-
-	script(type='text/template')#DebugLinkTemplate
-		div
-			a(href="#", title='Show Debug Information')#debugLink Debug
-
-	script(type='text/template')#trackChangesPanelTemplate
-		#trackChangesPanel
-			.track-changes-side-bar
-				.track-changes-header
-					h3 Recent changes
-					a(href="#").track-changes-close
-						i.icon-remove
-				.change-list-area
-			.track-changes-diff
-			.track-changes-upgrade-popup(style="display: none;")
-				.message.show-when-owner
-					p You need to upgrade your plan to use the History feature.
-					button.btn.btn-primary.start-free-trial Start free trial
-				.message.show-when-not-owner
-					p Please ask the project owner to upgrade to use the History feature.
-
-	script(type='text/template')#trackChangesDiffTemplate
-		.track-changes-diff-toolbar.btn-toolbar
-			.change-info
-				.number-of-changes {{ changes }} in <strong>{{ name }}</strong>
-				a(href="#").restore.btn.btn-small.btn-danger Restore to before these changes
-			.deleted-info(style="display:none;")
-				strong {{ name }}
-				.controls
-					span This file has been deleted 
-					a(href="#").restore-deleted.btn.btn-small.btn-success Restore
-		.track-changes-diff-editor
-
-	script(type='text/template')#changeListItemTemplate
-		div.track-changes-date-header {{ day }}
-
-		div.change-selectors
-			div.range
-			input(type="radio",name="fromVersion").change-selector-from
-			input(type="radio",name="toVersion").change-selector-to
-
-		div.change-description
-			div.change-time {{time}}
-			div.changed-docs {{docs}}
-			div {{{users}}}
-
-	script(type='text/template')#changeListItemUserTemplate
-		div(class='change-name')
-			div.color-square(style="background-color: hsl({{hue}}, 100%, 70%);")
-			span {{name}}
-
-	script(type='text/template')#changeListTemplate
-		ul.change-list.nav.nav-pills.nav-stacked
-			li.loading-changes Loading...
-			li.empty-message You haven't made any changes yet!
-
-	script(type='text/template')#hotKeysListTemplate
-		.hotkeys
-			h3 Common
-			.hotkeys-column
-				.hotkey
-					span.combination.win Ctrl + F
-					span.combination.mac Cmd + F
-					span.description     Find (and replace)
-				.hotkey
-					span.combination.win Ctrl + Enter
-					span.combination.mac Cmd + Enter
-					span.description     Compile
-				.hotkey
-					span.combination.win Ctrl + /
-					span.combination.mac Cmd + /
-					span.description     Toggle Comment
-			.hotkeys-column
-				.hotkey
-					span.combination.win Ctrl + Z
-					span.combination.mac Cmd + Z
-					span.description     Undo
-				.hotkey
-					span.combination.win Ctrl + Y
-					span.combination.mac Cmd + Y
-					span.description     Redo
-			.clear
-
-			h3 Navigation
-			.hotkeys-column
-				.hotkey
-					span.combination.win Ctrl + Home
-					span.combination.mac Cmd + Home
-					span.description     Beginning of document
-				.hotkey
-					span.combination.win Ctrl + End
-					span.combination.mac Cmd + End
-					span.description     End of document
-			.hotkeys-column
-				.hotkey
-					span.combination.win Ctrl + L
-					span.combination.mac Cmd + L
-					span.description     Go To Line
-			.clear
-
-			h3 Editing
-			.hotkeys-column
-				.hotkey
-					span.combination.win Ctrl + D
-					span.combination.mac Cmd + D
-					span.description     Delete Current Line
-				.hotkey
-					span.combination.win Ctrl + A
-					span.combination.mac Cmd + A
-					span.description     Select All
-				.hotkey
-					span.combination.win Tab
-					span.combination.mac Tab
-					span.description     Indent Selection
-			.hotkeys-column
-				.hotkey
-					span.combination.win Ctrl + U
-					span.combination.mac Ctrl + U 
-					span.description     To Uppercase
-				.hotkey
-					span.combination.win Ctrl + Shift + U
-					span.combination.mac Ctrl + Shift + U 
-					span.description     To Lowercase
-			.clear