clipperz
/
password-manager-mirror
mirror of http://git.whoc.org.uk/git/password-manager.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #75 from gcsolaroli/master 

More fixes for /delta
master-GE
Giulio Cesare Solaroli 2015-08-03 16:34:09 +02:00
parent 721beef8c8 ce3fd5d19c
commit b8abf8aea4
12 changed files with 244 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

201
frontend/delta/css/clipperz.css
View File

File diff suppressed because one or more lines are too long

2
frontend/delta/css/clipperz.css.map
View File

File diff suppressed because one or more lines are too long

7
frontend/delta/html/index_template.html
View File

@ -1,12 +1,11 @@
<!--
@copyright@
-->
<html manifest="manifest.appcache">
<head>
<title>Clipperz - keep it to yourself</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<!--
@copyright@
-->
<meta name="viewport" content="width=device-width, height=device-height, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" />
<meta name="robots" content="noindex" />
<meta http-equiv="cleartype" content="on" />

9
frontend/delta/js/Clipperz/PM/UI/Components/Panels/ExtraFeaturesPanel.js
View File

@ -80,6 +80,10 @@ Clipperz.PM.UI.Components.Panels.ExtraFeaturesPanelClass = React.createClass({
}
},
lock: function () {
console.log("LOCK");
},
logout: function () {
MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'logout');
},
@ -275,8 +279,9 @@ Clipperz.PM.UI.Components.Panels.ExtraFeaturesPanelClass = React.createClass({
]),
])
]),
React.DOM.li({'key':'logout', 'className':'link', 'onClick':this.logout}, [
React.DOM.h2({}, "Logout")
React.DOM.li({'key':'logout', 'className':'lock-logout'}, [
// React.DOM.h2({'className':'lock', 'onClick':this.lock}, "Lock"),
React.DOM.h2({'className':'logout', 'onClick':this.logout}, "Logout"),
])
])
]),

10
frontend/delta/js/Clipperz/PM/UI/Components/Selections.js
View File

@ -117,9 +117,13 @@ Clipperz.PM.UI.Components.SelectionsClass = React.createClass({
*/
React.DOM.div({'className':'search'}, [
React.DOM.form({'className':'searchForm'}, [
React.DOM.div({}, [
React.DOM.input({'type':'text', 'id':'searchValue', 'onFocus':this.handleSearchChange, 'onChange':this.handleSearchChange, 'onKeyDown':this.handleKeyDown, 'name':'search', 'value':this.props['searchTerm'] /*, 'placeholder':"search" */ }),
React.DOM.label({'htmlFor':'searchValue'}, 'search'),
React.DOM.div({'className':'form'}, [
React.DOM.div({'className':'input'}, [
React.DOM.input({'type':'text', 'id':'searchValue', 'onFocus':this.handleSearchChange, 'onChange':this.handleSearchChange, 'onKeyDown':this.handleKeyDown, 'name':'search', 'value':this.props['searchTerm'] /*, 'placeholder':"search" */ }),
]),
React.DOM.div({'className':'label'}, [
React.DOM.label({'htmlFor':'searchValue'}, 'search'),
]),
React.DOM.div({'className':'searchClear', 'onClick':this.clearSearch}, [
React.DOM.span({'className':'count'}, selectedCardCount),
React.DOM.span({'className':'clear'}, "clear")

5
frontend/delta/properties/creditsAndCopyrights.txt
View File

@ -1,6 +1,6 @@
@clipperz.license@
==> This application is build using also the following libraries
==> This application is build using also the following libraries
# MochiKit (http://www.mochikit.com)
* Repository: @mochikit.repository@ (version: @mochikit.version@ - commit: @mochikit.commit@)
@ -62,5 +62,4 @@
* Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
* License: http://opensource.org/licenses/BSD-3-Clause
===============================================================================
===============================================================================

2
frontend/delta/scss/core/fonts.scss
View File

File diff suppressed because one or more lines are too long

9
frontend/delta/scss/style/card.scss
View File

@ -491,7 +491,7 @@ $cardViewBasePadding: 10px;
.fieldValue {
font-size: 18pt;
line-height: 1.2em;
// line-height: 1em;
line-height: 28px;
// height: 1.3em;
// outline: none;
@include user-select(text);
@ -504,12 +504,15 @@ $cardViewBasePadding: 10px;
&.hidden {
font-family: clipperz-password;
font-size: 23pt;
font-size: 22pt;
line-height: 28px;
margin-top: -2px;
&.visible {
font-family: "clipperz-font";
font-size: 18pt;
line-height: 28px;
margin-top: 0px;
}
}
}

136
frontend/delta/scss/style/selectionPanel.scss
View File

@ -65,88 +65,73 @@ refer to http://www.clipperz.com.
.search {
form {
// padding:2px;
// position:relative;
// box-sizing:border-box;
// width:95%;
div {
div.form {
@include flexbox();
@include flex-direction(row);
@include align-items(stretch);
input {
@include flex(auto);
@include order(1);
div.label {
@include flex(none);
@include order(0);
font-family: "clipperz-font";
font-size: 14pt;
color: white;
background-color: black;
border: 0px;
border-bottom: 1px solid #333;
outline: none;
margin-right: 10px;
// color: #999;
// padding: 0px 30px;
// margin: 0px 5px;
// width: 100%;
// box-sizing:border-box;
width: $selectionPanelWidth - $iconColumnWidth;
@include placeholder {
font-style: italic;
color: #ccc;
label {
display: block;
@include icon-font();
font-weight: normal;
padding: 4px 8px 0px 8px;
font-size: 14pt;
vertical-align: baseline;
}
}
label {
@include flex(none);
@include order(0);
@include icon-font();
div.input {
@include flex(1);
@include order(1);
overflow: hidden;
font-weight: normal;
padding-left: 8px;
padding-right: 8px;
font-size: 14pt;
vertical-align: baseline;
margin-top: 10px;
input {
font-family: "clipperz-font";
font-size: 14pt;
color: white;
background-color: black;
border: 0px;
border-bottom: 1px solid #333;
outline: none;
display: block;
width: 160px;
// font-size: 18pt;
// padding-left: $spacing;
// padding-right:5px;
// position:absolute;
// top:9px;
// left:9px;
// color: #666;
@include placeholder {
font-style: italic;
color: #ccc;
}
}
}
.searchClear {
@include flex(none);
@include order(2);
@include align-self(flex-end);
cursor: pointer;
margin: 12px 12px 6px 0px;
padding-bottom: 4px;
.count {
margin-right: 0px;
display: none;
}
.clear {
@include icon-font();
display: none;
// @include border-radius(50%);
@include border-radius(4px);
color: white;
background-color: gray;
// right:9px;
// top:9px;
// padding: 5px;
span {
padding: 3px 5px;
font-size: 10pt;
cursor: pointer;
text-align: right;
display: block;
&.count {
display: none;
}
&.clear {
@include icon-font();
display: none;
@include border-radius(4px);
color: white;
background-color: gray;
font-size: 10pt;
margin-right: 12px;
}
}
&:hover {
@ -163,7 +148,6 @@ refer to http://www.clipperz.com.
}
.searchResultInfo {
// color: #999;
font-size: 10pt;
padding: 2px 6px;
display: none;
@ -291,17 +275,19 @@ $selectionColor: $clipperz-orange;
// }
form {
label {
color: $selectionColor;
}
.searchClear {
.count {
display: block;
div.form {
label {
color: $selectionColor;
}
.searchClear {
span.count {
display: block;
}
&:hover {
.count {
display: none;
&:hover {
.count {
display: none;
}
}
}
}

37
frontend/delta/scss/style/settingsPanel.scss
View File

@ -65,9 +65,10 @@ refer to http://www.clipperz.com.
// padding-left: 10px;
}
// &:last-child {
&:last-child {
// border-bottom: 1px solid white;
// }
border-bottom: 0px;
}
&.closed > ul {
display: none;
@ -167,7 +168,6 @@ refer to http://www.clipperz.com.
}
&.link {
h2 {
&:after {
@include icon-font();
@ -177,6 +177,37 @@ refer to http://www.clipperz.com.
}
};
}
&.lock-logout {
h2 {
padding: 10px;
font-size: 16pt;
cursor: pointer;
&:after {
@include icon-font();
color: gray;
padding-left: 10px;
}
&:hover {
&:after {
color: white;
}
}
&.lock {
&:after {
content: "lock";
}
}
&.logout {
&:after {
content: "logout";
}
}
}
}
}
}
}

3
properties/license.txt
View File

@ -1,3 +1,4 @@
GNU AFFERO GENERAL PUBLIC LICENSE
Copyright 2008-2015 Clipperz Srl
@ -29,4 +30,4 @@ For further information about Clipperz: https://clipperz.is
this application refer to this page:
<https://clipperz.is/security_privacy/security_code_review/>
===============================================================================
===============================================================================

2
scripts/builder/frontendBuilder.py
View File

@ -314,7 +314,7 @@ class FrontendBuilder(object):
if not self.processedFiles.has_key(processedFile):
#self.log("assembling copyright header")
copyrightValues = self.settings['copyright.values']
license = self.loadFilesContent('../../properties', ['license.txt'])
license = self.loadFilesContent('../../properties', ['license.AGPL.txt'])
result = self.loadFilesContent('properties', ['creditsAndCopyrights.txt'])
result = re.sub('@clipperz.license@', license, result)