diff --git a/css/bookmarklet.css b/css/bookmarklet.css index 58742fab..ba54b9bc 100644 --- a/css/bookmarklet.css +++ b/css/bookmarklet.css @@ -19,18 +19,27 @@ * along with this program. If not, see . * */ -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 */ diff --git a/css/bookmarklet.css.map b/css/bookmarklet.css.map index 965bcb8c..89bf04d5 100644 --- a/css/bookmarklet.css.map +++ b/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" diff --git a/js/app/controllers/bookmarklet.js b/js/app/controllers/bookmarklet.js index a1d292bd..6673dba2 100644 --- a/js/app/controllers/bookmarklet.js +++ b/js/app/controllers/bookmarklet.js @@ -411,9 +411,13 @@ NotificationService.showNotification($translate.instant('credential.created'), 5000); }); } + setTimeout(() => window.close(), 3000); }; + $scope.cancel = function () { + window.close(); + }; } ]); -}()); \ No newline at end of file +}()); diff --git a/js/app/controllers/settings.js b/js/app/controllers/settings.js index 750b41a4..9fa1f155 100644 --- a/js/app/controllers/settings.js +++ b/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; - $scope.bookmarklet = $sce.trustAsHtml("" + btn_txt + ""); + var http = location.protocol, slashes = http.concat("//"), host = slashes.concat(window.location.hostname + ":" + window.location.port), complete = host + location.pathname; + $scope.bookmarklet = $sce.trustAsHtml("" + btn_txt + ""); $scope.saveVaultSettings = function () { @@ -322,4 +322,4 @@ }]); -}()); \ No newline at end of file +}()); diff --git a/sass/bookmarklet.scss b/sass/bookmarklet.scss index fca8bc17..7abb30fe 100644 --- a/sass/bookmarklet.scss +++ b/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; + 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; -} \ No newline at end of file +} + +.icon-picker { + display: none; +} diff --git a/templates/bookmarklet.php b/templates/bookmarklet.php index 0d89e76a..dd65d678 100644 --- a/templates/bookmarklet.php +++ b/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,23 +93,43 @@ style('passman', 'bookmarklet');
-
- {{ 'bm.active.vault' | translate}} {{active_vault.name}}
- {{ 'change.vault' | translate }} -
- +
+
+
+
+
+ +
+
+ {{ active_vault.name }} +
+
+ {{ 'edit.credential' | translate }} + "{{ storedCredential.label }}" + {{ 'create.credential' | translate }} +
+
-
-
- - -
+
+
+ +
+ + +
+
+ + +
+
+
- \ No newline at end of file +