diff --git a/app/views/templates.jade b/app/views/templates.jade index e9dc797ab908a831cde7c4169a8aacd1a8ad8c87..fb0a7a8dd915996dfec6a6aed4ea02778d432b17 100644 --- a/app/views/templates.jade +++ b/app/views/templates.jade @@ -248,21 +248,22 @@ .small {{ content }} script(type="text/template")#projectMemberListTemplate - form.well.form-inline.addUserForm + form.form-inline.addUserForm table.table thead tr - th Email - th Privileges + th(colspan=2) Who can access this project: th tbody - {{#showAdminControls}} - input(type="email",placeholder="colleague@example.com")#newEmail.email.input-large - button.btn.btn-primary.addUser Add Collaborator - label.checkbox - input(type="checkbox") - | Enable Write Access - {{/showAdminControls}} + {{#showAdminControls}} + div.invite-controls + div.small Invite: + input(type="email",placeholder="Enter email addressess...")#newEmail.email.input-large + button.btn.btn-primary.addUser Share + label.checkbox + input(type="checkbox") + | Enable Write Access + {{/showAdminControls}} script(type="text/template")#projectMemberListItemTemplate tr.projectMember @@ -274,9 +275,7 @@ {{/showRemove}} script(type="text/template")#socialSharingTemplate - p.public-share - span Share Publicly - br + span a#shareTwitter(href="#").social-icons i.fa.fa-twitter-square.fa-2x | @@ -323,24 +322,29 @@ include project/partials/manage script(type="text/template")#userPanelTemplate - .modal.hide + .modal.hide.modal-share .modal-header h2 Share .modal-body #projectMembersList .row-fluid - .span6 - #socialSharing - .span6 - .control-group - label(for='select').control-label Access Level - .controls - select#publicAccessLevel - option(value='private') Private - option(value='readOnly') Public - Read Only - option(value='readAndWrite') Public - Read and Write + .public-sharing + table.table + thead + tr + th(colspan=2) Global Access + tbody + tr + td + span.control-group + span.controls + select#publicAccessLevel + option(value='private') Private + option(value='readOnly') Public - Read Only + option(value='readAndWrite') Public - Read and Write + span#socialSharing .modal-footer - button.btn.btn-primary(data-dismiss="modal") OK + button.btn.btn-primary(data-dismiss="modal") Done script(type="text/template")#historyPanelTemplate #revisionHistoryArea.fullEditorArea diff --git a/public/stylesheets/less/app/editor.less b/public/stylesheets/less/app/editor.less index 8d915aa5c8a2e0ca729f94a3c936e370890d64aa..0544a7939cde9910ebe4b63794ffd6e97bf63800 100644 --- a/public/stylesheets/less/app/editor.less +++ b/public/stylesheets/less/app/editor.less @@ -1406,3 +1406,32 @@ table { margin-bottom: 6px; } } + +.modal-share { + width: 700px; + margin-left: -350px; + .modal-body { + padding: 0 0.6em; + } + .invite-controls { + padding: 0.8em; + background-color: #eee; + .small { + font-size: 0.9em; + color: #666; + } + input.email { + width: 450px; + } + label.checkbox { + display: block; + } + } + .public-sharing { + margin: 0.4em; + padding-top: 0.4em; + #socialSharing { + float: right; + } + } +}