github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-10 20:27:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/sharelatex/web-sharelatex

Browse source
This commit is contained in:
Henry Oswald 2016-03-22 12:30:52 +00:00
commit cacb3bf39e
3 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/web/app/views/project/list/modals.jade
View file

@ -183,7 +183,9 @@ script(type='text/ng-template', id='deleteProjectsModalTemplate')
data-dismiss="modal"
ng-click="cancel()"
) ×
h3 {{action}} #{translate("projects")}
h3(ng-if="action == 'delete'") #{translate("delete_projects")}
h3(ng-if="action == 'leave'") #{translate("leave_projects")}
h3(ng-if="action == 'delete-and-leave'") #{translate("delete_and_leave_projects")}
.modal-body
div(ng-show="projectsToDelete.length > 0")
p #{translate("about_to_delete_projects")}

18
services/web/app/views/project/list/project-list.jade
View file

@ -24,7 +24,7 @@
.btn-toolbar(ng-show="filter != 'archived'")
.btn-group(ng-hide="selectedProjects.length < 1")
a.btn.btn-default(
href='#',
href,
tooltip="#{translate('download')}",
tooltip-placement="bottom",
tooltip-append-to-body="true",
@ -32,7 +32,7 @@
)
i.fa.fa-cloud-download
a.btn.btn-default(
href='#',
href,
tooltip="#{translate('delete')}",
tooltip-placement="bottom",
tooltip-append-to-body="true",
@ -42,7 +42,7 @@
.btn-group.dropdown(ng-hide="selectedProjects.length < 1", dropdown)
a.btn.btn-default.dropdown-toggle(
href="#",
href,
data-toggle="dropdown",
dropdown-toggle,
tooltip="#{translate('add_to_folders')}",
@ -72,11 +72,11 @@
| {{tag.name}}
li.divider
li
a(href="#", ng-click="openNewTagModal()", stop-propagation="click") #{translate("create_new_folder")}
a(href, ng-click="openNewTagModal()", stop-propagation="click") #{translate("create_new_folder")}
.btn-group(ng-hide="selectedProjects.length != 1", dropdown).dropdown
a.btn.btn-default.dropdown-toggle(
href='#',
href,
data-toggle="dropdown",
dropdown-toggle
) #{translate("more")}
@ -84,19 +84,19 @@
ul.dropdown-menu.dropdown-menu-right(role="menu")
li(ng-show="getFirstSelectedProject().accessLevel == 'owner'")
a(
href='#',
href,
ng-click="openRenameProjectModal()"
) #{translate("rename")}
li
a(
href='#',
href,
ng-click="openCloneProjectModal()"
) #{translate("make_copy")}
.btn-toolbar(ng-show="filter == 'archived'")
.btn-group(ng-hide="selectedProjects.length < 1")
a.btn.btn-default(
href='#',
href,
data-original-title="Restore",
data-toggle="tooltip",
data-placement="bottom",
@ -105,7 +105,7 @@
.btn-group(ng-hide="selectedProjects.length < 1")
a.btn.btn-danger(
href='#',
href,
data-original-title="Delete Forever",
data-toggle="tooltip",
data-placement="bottom",

6
services/web/public/coffee/main/project-list/modal-controllers.coffee
View file

@ -65,11 +65,11 @@ define [
$scope.projectsToLeave = projects.filter (project) -> project.accessLevel != "owner"
if $scope.projectsToLeave.length > 0 and $scope.projectsToDelete.length > 0
$scope.action = "Delete & Leave"
$scope.action = "delete-and-leave"
else if $scope.projectsToLeave.length == 0 and $scope.projectsToDelete.length > 0
$scope.action = "Delete"
$scope.action = "delete"
else
$scope.action = "Leave"
$scope.action = "leave"
$scope.delete = () ->
$modalInstance.close()