fix bookmarklet

Signed-off-by: binsky <timo@binsky.org>

css/bookmarklet.css

@@ -19,18 +19,27 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-header, nav {
+header {
   display: none; }
 
 #content-wrapper {
   padding-top: 0; }
 
+#app-content {
+  margin-left: 0;
+  overflow-x: auto; }
+
 #app-content-wrapper {
   min-height: inherit !important; }
 
 .warning_bar .fa-times {
   margin-right: 20px; }
 
+#passman-controls .breadcrumb {
+  padding-left: 0; }
+  #passman-controls .breadcrumb a, #passman-controls .breadcrumb a i {
+    cursor: default; }
+
 .tab_container {
   padding-top: 10px;
   margin-bottom: 20px; }
@@ -53,4 +62,7 @@ header, nav {
 .angularjs-datetime-picker {
   z-index: 9999; }
 
+.icon-picker {
+  display: none; }
+
 /*# sourceMappingURL=bookmarklet.css.map */

css/bookmarklet.css.map

@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,WAAW;EACT,OAAO,EAAE,IAAI;;AAKf,gBAAgB;EACd,WAAW,EAAE,CAAC;;AAIhB,oBAAoB;EAClB,UAAU,EAAE,kBAAkB;;AAGhC,sBAAuB;EACtB,YAAY,EAAE,IAAI;;AAEnB,cAAc;EACZ,WAAW,EAAE,IAAI;EAKjB,aAAa,EAAE,IAAI;EAJnB,kBAAG;IACD,aAAa,EAAE,GAAG;IAClB,QAAQ,EAAE,MAAM;;AAIpB,cAAc;EACZ,UAAU,EAAE,IAAI;;AAElB,aAAa;EACX,KAAK,EAAE,KAAK;EACZ,UAAU,EAAE,KAAK;EACjB,aAAa,EAAE,GAAG;EAClB,SAAS,EAAE,IAAI;;AAEjB,WAAW;EACT,MAAM,EAAE,CAAC;;AAEX,0BAA0B;EACxB,OAAO,EAAE,IAAI",
+"mappings": "AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,MAAO;EACL,OAAO,EAAE,IAAI;;AAOf,gBAAiB;EACf,WAAW,EAAE,CAAC;;AAIhB,YAAa;EACX,WAAW,EAAE,CAAC;EACd,UAAU,EAAE,IAAI;;AAGlB,oBAAqB;EACnB,UAAU,EAAE,kBAAkB;;AAGhC,sBAAuB;EACrB,YAAY,EAAE,IAAI;;AAGpB,6BAA8B;EAC5B,YAAY,EAAE,CAAC;EACf,kEAAO;IACL,MAAM,EAAE,OAAO;;AAInB,cAAe;EACb,WAAW,EAAE,IAAI;EAOjB,aAAa,EAAE,IAAI;EALnB,kBAAI;IACF,aAAa,EAAE,GAAG;IAClB,QAAQ,EAAE,MAAM;;AAMpB,cAAe;EACb,UAAU,EAAE,IAAI;;AAGlB,aAAc;EACZ,KAAK,EAAE,KAAK;EACZ,UAAU,EAAE,KAAK;EACjB,aAAa,EAAE,GAAG;EAClB,SAAS,EAAE,IAAI;;AAGjB,WAAY;EACV,MAAM,EAAE,CAAC;;AAGX,0BAA2B;EACzB,OAAO,EAAE,IAAI;;AAGf,YAAa;EACX,OAAO,EAAE,IAAI",
 "sources": ["../sass/bookmarklet.scss"],
 "names": [],
 "file": "bookmarklet.css"

js/app/controllers/bookmarklet.js

@@ -411,8 +411,12 @@
 							NotificationService.showNotification($translate.instant('credential.created'), 5000);
 						});
 					}
+					setTimeout(() => window.close(), 3000);
 				};
 
+				$scope.cancel = function () {
+					window.close();
+				};
 			}
 		]);
 

js/app/controllers/settings.js

@@ -87,8 +87,8 @@
 				});
 
 				var btn_txt = $translate.instant('bookmarklet.text');
-				var http = location.protocol, slashes = http.concat("//"), host = slashes.concat(window.location.hostname), complete = host + location.pathname;
+				var http = location.protocol, slashes = http.concat("//"), host = slashes.concat(window.location.hostname + ":" + window.location.port), complete = host + location.pathname;
-				$scope.bookmarklet = $sce.trustAsHtml("<a class=\"button\" href=\"javascript:(function(){var a=window,b=document,c=encodeURIComponent,e=c(document.title),d=a.open('" + complete + "bookmarklet?url='+c(b.location)+'&title='+e,'bkmk_popup','left='+((a.screenX||a.screenLeft)+10)+',top='+((a.screenY||a.screenTop)+10)+',height=750px,width=475px,resizable=0,alwaysRaised=1');a.setTimeout(function(){d.focus()},300);})();\">" + btn_txt + "</a>");
+				$scope.bookmarklet = $sce.trustAsHtml("<a class=\"button\" href=\"javascript:(function(){var a=window,b=document,c=encodeURIComponent,e=c(document.title),d=a.open('" + complete + "/bookmarklet?url='+c(b.location)+'&title='+e,'bkmk_popup','left='+((a.screenX||a.screenLeft)+10)+',top='+((a.screenY||a.screenTop)+10)+',height=750px,width=475px,resizable=0,alwaysRaised=1');a.setTimeout(function(){d.focus()},300);})();\">" + btn_txt + "</a>");
 
 
 				$scope.saveVaultSettings = function () {

sass/bookmarklet.scss

@@ -20,44 +20,69 @@
  *
  */
 
-header, nav{
+header {
   display: none;
 }
-#content{
+
+#content {
 
 }
-#content-wrapper{
+
+#content-wrapper {
   padding-top: 0;
 
 }
 
-#app-content-wrapper{
+#app-content {
+  margin-left: 0;
+  overflow-x: auto;
+}
+
+#app-content-wrapper {
   min-height: inherit !important;
 }
 
 .warning_bar .fa-times {
   margin-right: 20px;
 }
-.tab_container{
+
+#passman-controls .breadcrumb {
+  padding-left: 0;
+  a, a i {
+    cursor: default;
+  }
+}
+
+.tab_container {
   padding-top: 10px;
-  div{
+
+  div {
     margin-bottom: 5px;
     overflow: hidden;
   }
+
   margin-bottom: 20px;
 }
-.vault_wrapper{
+
+.vault_wrapper {
   margin-top: 70px;
 }
-.active_vault{
+
+.active_vault {
   float: right;
   text-align: right;
   padding-right: 5px;
   font-size: 10px;
 }
-.tab_header{
+
+.tab_header {
   margin: 0;
 }
-.angularjs-datetime-picker{
+
+.angularjs-datetime-picker {
   z-index: 9999;
 }
+
+.icon-picker {
+  display: none;
+}

templates/bookmarklet.php

@@ -17,7 +17,6 @@ script('passman', 'vendor/angular-translate/angular-translate.min');
 script('passman', 'vendor/angular-translate/angular-translate-loader-url.min');
 script('passman', 'vendor/ng-password-meter/ng-password-meter');
 script('passman', 'vendor/sjcl/sjcl');
-script('passman', 'vendor/ui-sortable/sortable');
 script('passman', 'vendor/zxcvbn/zxcvbn');
 script('passman', 'vendor/ng-clipboard/clipboard.min');
 script('passman', 'vendor/ng-clipboard/ngclipboard');
@@ -26,6 +25,9 @@ script('passman', 'vendor/angular-xeditable/xeditable.min');
 script('passman', 'vendor/sha/sha');
 script('passman', 'vendor/llqrcode/llqrcode');
 script('passman', 'vendor/forge.0.6.9.min');
+script('passman', 'vendor/download');
+script('passman', 'vendor/ui-sortable/sortable');
+script('passman', 'vendor/papa-parse/papaparse.min');
 script('passman', 'lib/promise');
 script('passman', 'lib/crypto_wrap');
 
@@ -37,6 +39,9 @@ script('passman', 'app/controllers/bookmarklet');
 script('passman', 'app/filters/range');
 script('passman', 'app/filters/propsfilter');
 script('passman', 'app/filters/byte');
+script('passman', 'app/filters/tagfilter');
+script('passman', 'app/filters/escapeHTML');
+script('passman', 'app/filters/as');
 script('passman', 'app/services/vaultservice');
 script('passman', 'app/services/credentialservice');
 script('passman', 'app/services/settingsservice');
@@ -88,17 +93,35 @@ style('passman', 'bookmarklet');
 				<div ng-include="'views/vaults.html'"></div>
 		</div>
 		<div id="app-content-wrapper" ng-if="active_vault !== false">
-			<div class="active_vault">
+            <div id="content">
-				{{ 'bm.active.vault' | translate}} {{active_vault.name}}<br />
+                <div id="passman-controls">
-				<span class="link" ng-click="logout()">{{ 'change.vault' | translate }}</span>
+                    <div class="breadcrumb">
+                        <div class="breadcrumb">
+                            <div class="crumb svg ui-droppable" data-dir="/">
+                                <a><i class="fa fa-home"></i></a>
                             </div>
-			<ul class="tab_header">
+                            <div class="crumb svg" data-dir="/Test">
-				<li ng-repeat="tab in tabs track by $index" class="tab"
+                                <a>{{ active_vault.name }}</a>
-					ng-class="{active:isActiveTab(tab)}"
+                            </div>
-					ng-click="onClickTab(tab)" use-theme
+                            <div class="crumb svg last" data-dir="/Test">
-				>{{tab.title}}
+                                <a ng-if="storedCredential.credential_id">{{ 'edit.credential' | translate }}
+                                    "{{ storedCredential.label }}"</a>
+                                <a ng-if="!storedCredential.credential_id">{{ 'create.credential' | translate }}</a>
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+
+                <div class="app-sidebar-tabs">
+                    <nav class="app-sidebar-tabs__nav">
+                        <ul>
+                            <li ng-repeat="tab in tabs track by $index" class="app-sidebar-tabs__tab"
+                                ng-class="isActiveTab(tab)? 'active' : 'inactive'"
+                                ng-click="onClickTab(tab)">{{ tab.title }}
                             </li>
                         </ul>
+                    </nav>
 
                     <div class="tab_container edit_credential">
                         <div ng-include="currentTab.url"></div>
@@ -107,4 +130,6 @@ style('passman', 'bookmarklet');
                     </div>
                 </div>
             </div>
+		</div>
+	</div>
 </div>