remove sharing

2017-01-14 12:33:28 -06:00
parent 66298b8799
commit 36ada08a33
17 changed files with 37 additions and 372 deletions
--- a/app/assets/templates/frontend/editor.html.haml
+++ b/app/assets/templates/frontend/editor.html.haml
@@ -1,10 +1,9 @@
 .section.editor{"ng-class" => "{'fullscreen' : ctrl.fullscreen}"}
  .content
-    -# %span.fullscreen-ghost-bar{"ng-if" => "ctrl.fullscreen"}
-    .section-title-bar.editor-heading{"ng-class" => "{'shared' : ctrl.note.isPublic(), 'fullscreen' : ctrl.fullscreen }"}
+    .section-title-bar.editor-heading{"ng-class" => "{'fullscreen' : ctrl.fullscreen }"}
      .title
        %input.input#note-title-editor{"ng-model" => "ctrl.note.title", "ng-keyup" => "$event.keyCode == 13 && ctrl.saveTitle($event)",
-                  "ng-disabled" => "ctrl.note.locked", "ng-change" => "ctrl.nameChanged()", "ng-focus" => "ctrl.onNameFocus()",
+                  "ng-change" => "ctrl.nameChanged()", "ng-focus" => "ctrl.onNameFocus()",
                  "select-on-click" => "true"}
      .save-status {{ctrl.noteStatus}}
      .section-menu
@@ -12,24 +11,16 @@
          %li.dropdown
            %a.dropdown-toggle{"ng-click" => "ctrl.clickedMenu(); ctrl.showExtensions = false"}
              File
-              %span.caret{"ng-if" => "!ctrl.note.locked"}
-              %span{"ng-if" => " ctrl.note.locked"}
-                .inline-icon.icon-lock
+              %span.caret
              %span.sr-only

-            %ul.dropdown-menu.dropdown-menu-left.nt-dropdown-menu.dark{"ng-if" => "ctrl.showMenu && !ctrl.note.locked"}
+            %ul.dropdown-menu.dropdown-menu-left.nt-dropdown-menu.dark{"ng-if" => "ctrl.showMenu"}
              %li{"ng-click" => "ctrl.selectedMenuItem(); ctrl.toggleFullScreen()"}
                .text Toggle Fullscreen
                .shortcut Cmd + O
              %li{"ng-click" => "ctrl.selectedMenuItem(); ctrl.toggleMarkdown()"}
                .text Toggle Markdown Preview
                .shortcut Cmd + M
-              %li{"ng-if" => "!ctrl.note.isSharedIndividually()", "ng-click" => "ctrl.selectedMenuItem(); ctrl.shareNote()"}
-                .text Share
-              %li{"ng-if" => "ctrl.note.isSharedIndividually()", "ng-click" => "ctrl.selectedMenuItem(); ctrl.editUrlPressed()"}
-                .text Edit URL
-              %li{"ng-if" => "ctrl.note.isSharedIndividually()", "ng-click" => "ctrl.selectedMenuItem(); ctrl.unshareNote()"}
-                .text Unshare
              %li{"ng-click" => "ctrl.deleteNote()"}
                .text Delete
          %li.sep
@@ -45,21 +36,8 @@
          .panel.panel-default.info-panel{"ng-if" => "ctrl.showMarkdown"}
            .panel-body{"style" => "text-align: center; color: black;"}
              This editor is Markdown enabled.
-        .menu-right-container
-          .public-link{"ng-if" => "ctrl.note.isPublic()"}
-            %a.url{"ng-if" => "!ctrl.editingUrl", "href" => "{{ctrl.publicUrlForNote(ctrl.note)}}", "target" => "_blank"}
-              %span.icon-rss.icon
-              %span{"ng-if" => "ctrl.note.isSharedIndividually()"}{{ctrl.publicUrlForNote(note)}}
-            .edit-url{"ng-if" => "ctrl.editingUrl"}
-              {{ctrl.url.base}}
-              %input.input{"ng-model" => "ctrl.url.token", "ng-keyup" => "$event.keyCode == 13 && ctrl.saveUrl($event)",
-                        "ng-disabled" => "ctrl.note.locked", "ng-change" => "ctrl.urlChanged()", "ng-focus" => "ctrl.onUrlFocus()",
-                        "select-on-click" => "true", "autofocus" => "true"}

-    .editor-content{"ng-class" => "{'shared' : ctrl.note.isPublic(), 'fullscreen' : ctrl.fullscreen }"}
-      .sampler-container{"ng-if" => "ctrl.showSampler", "ng-click" => "ctrl.focusEditor()"}
-        %strong.name-sampler.sampler{"typewrite" => "true", "text" =>  "ctrl.demoNoteNames", "type-delay" => "30", "initial-delay" => "1.5s",
-                                      "iteration-callback" => "ctrl.callback", "prebegin-fn" => "ctrl.prebeginFn", "iteration-delay" => "2000", "cursor" => ""}
-      %textarea.editable#note-text-editor{"ng-class" => "{'fullscreen' : ctrl.fullscreen }", "ng-disabled" => "ctrl.note.locked", "ng-show" => "ctrl.editorMode == 'edit'", "ng-model" => "ctrl.note.text",
+    .editor-content{"ng-class" => "{'fullscreen' : ctrl.fullscreen }"}
+      %textarea.editable#note-text-editor{"ng-class" => "{'fullscreen' : ctrl.fullscreen }", "ng-show" => "ctrl.editorMode == 'edit'", "ng-model" => "ctrl.note.text",
       "ng-change" => "ctrl.contentChanged()", "ng-click" => "ctrl.clickedTextArea()", "ng-focus" => "ctrl.onContentFocus()"}
      .preview{"ng-class" => "{'fullscreen' : ctrl.fullscreen }", "ng-if" => "ctrl.editorMode == 'preview'", "ng-bind-html" => "ctrl.renderedContent()", "ng-dblclick" => "ctrl.onPreviewDoubleClick()"}
--- a/app/assets/templates/frontend/header.html.haml
+++ b/app/assets/templates/frontend/header.html.haml
@@ -4,12 +4,12 @@
      .items
        .item.account
          %div{"ng-click" => "ctrl.accountMenuPressed()"}
-            %div{"ng-if" => "ctrl.user.email"} Account
-            %div{"ng-if" => "!ctrl.user.email"} Sign in or Register
+            %div{"ng-if" => "ctrl.user"} Account
+            %div{"ng-if" => "!ctrl.user"} Sign in or Register
          .panel.panel-default.account-panel.panel-right{"ng-if" => "ctrl.showAccountMenu"}
            .panel-body
              .account-items
-                .account-item.registration-login{"ng-if" => "!ctrl.user.email"}
+                .account-item.registration-login{"ng-if" => "!ctrl.user"}
                  .account-item
                    .meta-container
                      .title Server
@@ -46,11 +46,10 @@
                      Because notes are locally encrypted using a secret key derived from your password, there's no way to decrypt these notes if you forget your password.
                      For this reason, Standard Notes cannot offer a password reset option. You <strong>must</strong> make sure to store or remember your password.

-
-                .account-item{"ng-if" => "ctrl.user.email"}
+                .account-item{"ng-if" => "ctrl.user"}
                  .email {{ctrl.user.email}}
                  .server {{ctrl.serverData.url}}
-                  .links{"ng-if" => "ctrl.user.email"}
+                  .links{"ng-if" => "ctrl.user"}
                    -# .link-item
                    -#   %a{"ng-click" => "ctrl.changePasswordPressed()"} Change Password
                    -#   %form.account-form{"ng-if" => "ctrl.showNewPasswordForm", 'ng-submit' => 'ctrl.submitPasswordChange()', 'name' => "passwordChangeForm"}
@@ -71,8 +70,8 @@
                    .desc Notes are encrypted locally before being sent to the server. Neither the server owner nor an intrusive entity can decrypt your locally encrypted notes.
                  .action-container
                    %span.status-title Status:
-                    {{ctrl.encryptionStatusForNotes()}} (shared notes not encrypted)
-                .account-item{"ng-if" => "ctrl.user.email"}
+                    {{ctrl.encryptionStatusForNotes()}}
+                .account-item{"ng-if" => "ctrl.user"}
                  .meta-container
                    .title Data Archives
                    .options{"style" => "font-size: 12px; margin-top: 4px;"}
--- a/app/assets/templates/frontend/modals/username.html.haml
+++ b/app/assets/templates/frontend/modals/username.html.haml
@@ -1,2 +0,0 @@
-%strong Choose a public username for all your shared note tags.
-%input{"style" => "margin-top: 10px; padding-left: 8px;", "type" => "text", "ng-keyup" => "$event.keyCode == 13 && saveUsername($event)", "ng-model" => "formData.username"}
--- a/app/assets/templates/frontend/notes.html.haml
+++ b/app/assets/templates/frontend/notes.html.haml
@@ -15,23 +15,9 @@
              %span.sr-only

            %ul.dropdown-menu.dropdown-menu-left.nt-dropdown-menu.dark{"ng-if" => "ctrl.showMenu"}
-              %li{"ng-if" => "!ctrl.tag.isPublic()"}
-                %a.text{"ng-click" => "ctrl.selectedMenuItem(); ctrl.selectedTagShare($event)"} Share Tag
-              %li{"ng-if" => "ctrl.tag.isPublic()"}
-                %a.text{"ng-click" => "ctrl.selectedMenuItem(); ctrl.selectedTagUnshare()"} Unshare Tag
-              %li{"ng-if" => "!ctrl.tag.all"}
+              %li
                %a.text{"ng-click" => "ctrl.selectedMenuItem(); ctrl.selectedTagDelete()"} Delete Tag

-        .menu-right-container
-          .public-link{"ng-if" => "ctrl.tag.isPublic()"}
-            %a.url{"ng-if" => "!ctrl.editingUrl", "href" => "{{ctrl.tag.presentationURL()}}", "target" => "_blank"}
-              %span.icon-rss.icon
-              {{ctrl.tag.presentationURL()}}
-            .edit-url{"ng-if" => "ctrl.editingUrl"}
-              {{ctrl.url.base}}
-              %input.input{"ng-model" => "ctrl.url.token", "ng-keyup" => "$event.keyCode == 13 && ctrl.saveUrl($event)",
-                        "ng-change" => "ctrl.urlChanged()", "ng-focus" => "ctrl.onUrlFocus()",
-                        "select-on-click" => "true", "autofocus" => "true"}
    .note{"ng-repeat" => "note in ctrl.tag.notes | filter: ctrl.filterNotes",
        "ng-click" => "ctrl.selectNote(note)", "ng-class" => "{'selected' : ctrl.selectedNote == note}",
        "ng-attr-draggable" => "{{note.dummy ? undefined : 'true'}}", "note" => "note"}
--- a/app/assets/templates/frontend/tags.html.haml
+++ b/app/assets/templates/frontend/tags.html.haml
@@ -11,7 +11,7 @@

    .tag{"ng-repeat" => "tag in ctrl.tags", "ng-click" => "ctrl.selectTag(tag)", "ng-class" => "{'selected' : ctrl.selectedTag == tag}",
    "droppable" => true, "drop" => "ctrl.handleDrop", "tag" => "tag"}
-      .icon.icon-rss{"ng-if" => "tag.isPublic()"}
+
      %input.title{"ng-disabled" => "tag != ctrl.selectedTag", "ng-model" => "tag.title",
      "ng-keyup" => "$event.keyCode == 13 && ctrl.saveTag($event, tag)", "mb-autofocus" => "true", "should-focus" => "ctrl.newTag",
      "ng-change" => "ctrl.tagTitleDidChange(tag)", "ng-focus" => "ctrl.onTagTitleFocus(tag)"}