summaryrefslogtreecommitdiff
path: root/frontend
authorGiulio Cesare Solaroli <giulio.cesare@solaroli.it>2012-03-17 21:30:29 (UTC)
committer Giulio Cesare Solaroli <giulio.cesare@solaroli.it>2012-03-17 21:30:29 (UTC)
commit758bd68eee9c0ae1d3ad8dc50481c78557bd6228 (patch) (side-by-side diff)
tree42fe98603849248c0d3943fd1d79135a734811c9 /frontend
parent288b8df03a499a2e68ebaad48e687d1eac9df0ff (diff)
parent12cd9d47a6e1c8f8dad28d53a261412218ace6d3 (diff)
downloadclipperz-758bd68eee9c0ae1d3ad8dc50481c78557bd6228.zip
clipperz-758bd68eee9c0ae1d3ad8dc50481c78557bd6228.tar.gz
clipperz-758bd68eee9c0ae1d3ad8dc50481c78557bd6228.tar.bz2
Merge pull request #35 from gcsolaroli/master
Merged pull request #33
Diffstat (limited to 'frontend') (more/less context) (ignore whitespace changes)
-rw-r--r--frontend/beta/properties/beta.properties.json5
-rw-r--r--frontend/gamma/properties/gamma.properties.json2
2 files changed, 5 insertions, 2 deletions
diff --git a/frontend/beta/properties/beta.properties.json b/frontend/beta/properties/beta.properties.json
index 476becd..810215b 100644
--- a/frontend/beta/properties/beta.properties.json
+++ b/frontend/beta/properties/beta.properties.json
@@ -154,34 +154,37 @@
"Clipperz/PM/BookmarkletProcessor.js",
"Clipperz/PM/DataModel/User.js",
"Clipperz/PM/DataModel/UserPreferences.js",
"Clipperz/PM/DataModel/Header.js",
"Clipperz/PM/DataModel/Statistics.js",
"Clipperz/PM/DataModel/Record.js",
"Clipperz/PM/DataModel/RecordField.js",
"Clipperz/PM/DataModel/RecordVersion.js",
"Clipperz/PM/DataModel/DirectLogin.js",
"Clipperz/PM/DataModel/DirectLoginReference.js",
"Clipperz/PM/DataModel/DirectLoginInput.js",
"Clipperz/PM/DataModel/DirectLoginBinding.js",
"Clipperz/PM/DataModel/OneTimePasswordManager.js",
"Clipperz/PM/DataModel/OneTimePassword.js",
"Clipperz/YUI/IBLayoutManager.js",
"Clipperz/YUI/IBLayoutRegion.js",
"Clipperz/YUI/Drawer.js",
"Clipperz/YUI/Collapser.js",
"Clipperz/YUI/MessageBox.js",
"Clipperz/YUI/DomHelper.js",
"Clipperz/PM/Main.js"
],
"css": [
"yui-extensions/reset-min.css",
"yui-extensions/core.css",
"yui-extensions/basic-dialog.css",
"yui-extensions/button.css",
"clipperz/clipperz.css",
"clipperz/compact.css",
"clipperz/ytheme-clipperz.css"
- ]
+ ],
+
+ "html.template": "index_template.html"
+
}
diff --git a/frontend/gamma/properties/gamma.properties.json b/frontend/gamma/properties/gamma.properties.json
index 0a513e8..c847812 100644
--- a/frontend/gamma/properties/gamma.properties.json
+++ b/frontend/gamma/properties/gamma.properties.json
@@ -159,33 +159,33 @@
"Clipperz/PM/UI/Web/Components/AccountPanel.js",
"Clipperz/PM/UI/Web/Components/DataPanel.js",
"Clipperz/PM/UI/Web/Components/ToolsPanel.js",
"Clipperz/PM/UI/Web/Components/RulerComponent.js",
"Clipperz/PM/UI/Web/Components/CardDialogComponent.js",
"Clipperz/PM/UI/Web/Components/CardDialogRecordFieldComponent.js",
"Clipperz/PM/UI/Web/Components/CardDialogRecordDirectLoginComponent.js",
"Clipperz/PM/UI/Web/Components/DirectLoginEditingComponent.js",
"Clipperz/PM/UI/Web/Components/DirectLoginEditingBindingComponent.js",
"Clipperz/PM/UI/Web/Components/DirectLoginEditingFormValueComponent.js",
"Clipperz/PM/UI/Web/Components/BookmarkletComponent.js",
"Clipperz/PM/UI/Web/Components/UnlockPasswordComponent.js",
"Clipperz/PM/UI/Web/Components/NewUserCreationComponent.js",
"Clipperz/PM/UI/Web/Components/PasswordTooltip.js",
"Clipperz/PM/UI/Web/Controllers/MainController.js",
"Clipperz/PM/UI/Web/Controllers/LoginController.js",
"Clipperz/PM/UI/Web/Controllers/AppController.js",
"Clipperz/PM/UI/Web/Controllers/FilterController.js",
"Clipperz/PM/UI/Web/Controllers/GridController.js",
"Clipperz/PM/UI/Web/Controllers/CardsController.js",
"Clipperz/PM/UI/Web/Controllers/DirectLoginsController.js",
"Clipperz/PM/UI/Web/Controllers/CardDialogController.js",
"Clipperz/PM/UI/Web/Controllers/DirectLoginWizardController.js",
"Clipperz/PM/UI/Web/Controllers/NewUserWizardController.js",
"main.js"
],
"css": [
"web.css"
]
-} \ No newline at end of file
+}