clipperz/password-manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge https://github.com/clipperz/password-manager

Browse Source
This commit is contained in:
Dario Chiappetta 2015-08-26 22:57:28 +02:00
commit 5cfd6588d7
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/delta/js/Clipperz/PM/UI/Components/CardToolbar.js
View File

@ -96,9 +96,7 @@ Clipperz.PM.UI.Components.CardToolbarClass = React.createClass({
}, },
render: function () { render: function () {
//console.log("CardToolbar props", this.props);
return React.DOM.div({className:'cardToolbar ' + this.props['style']}, [ return React.DOM.div({className:'cardToolbar ' + this.props['style']}, [
// React.DOM.div({className:'header'}, this.props['enableSidePanels'] ? this.renderWithSidePanels() : this.renderWithoutSidePanels()),
React.DOM.header({}, this.props['enableSidePanels'] ? this.renderWithSidePanels() : this.renderWithoutSidePanels()), React.DOM.header({}, this.props['enableSidePanels'] ? this.renderWithSidePanels() : this.renderWithoutSidePanels()),
Clipperz.PM.UI.Components.AccountStatus(MochiKit.Base.update(this.props['accountInfo'], this.props['proxyInfo'])), Clipperz.PM.UI.Components.AccountStatus(MochiKit.Base.update(this.props['accountInfo'], this.props['proxyInfo'])),
Clipperz.PM.UI.Components.MessageBox(this.props['messageBox']), Clipperz.PM.UI.Components.MessageBox(this.props['messageBox']),

2
frontend/delta/js/Clipperz/PM/UI/Components/Cards/View.js
View File

@ -276,7 +276,7 @@ Clipperz.PM.UI.Components.Cards.ViewClass = React.createClass({
if (this.props['loading'] == true) { if (this.props['loading'] == true) {
result = this.renderLoading(); result = this.renderLoading();
} else if (this.props['label']) { } else if (this.props['_reference']) {
result = this.renderCard(); result = this.renderCard();
} else { } else {
result = this.renderEmpty(); result = this.renderEmpty();