Merge pull request #35 from gcsolaroli/master

Merged pull request #33

3 files changed, 7 insertions, 4 deletions

diff --git a/backend/python/properties/python.properties.json b/backend/python/properties/python.properties.json
index 128c98e..8dd872f 100644
--- a/backend/python/properties/python.properties.json
+++ b/backend/python/properties/python.properties.json
@@ -1,8 +1,8 @@
 {
         "request.path": "clipperz.py",
-        "should.pay.toll": "false"
+        "should.pay.toll": "false",
 
         "development.settings": {
                 "url": "http://localhost/python/clipperz"
         }
-}
\ No newline at end of file
+}
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
@@ -122,66 +122,69 @@
                 "Clipperz/PM/Components/RecordDetail/DirectLoginComponent.js",
                 "Clipperz/PM/Components/RecordDetail/DirectLoginBindingComponent.js",
                 "Clipperz/PM/Components/RecordDetail/DirectLoginValueComponent.js",
                 "Clipperz/PM/Components/RecordDetail/CreationWizard.js",
                 "Clipperz/PM/Components/TabPanel/TabPanelController.js",
                 "Clipperz/PM/Components/Import/MainComponent.js",
                 "Clipperz/PM/Components/Import/GenericImportComponent.js",
                 "Clipperz/PM/Components/Import/CSVImportComponent.js",
                 "Clipperz/PM/Components/Import/CSVImport/CSVImportColumns.js",
                 "Clipperz/PM/Components/Import/CSVImport/CSVImportHeader.js",
                 "Clipperz/PM/Components/Import/CSVImport/CSVImportTitle.js",
                 "Clipperz/PM/Components/Import/CSVImport/CSVImportNotes.js",
                 "Clipperz/PM/Components/Import/CSVImport/CSVImportFields.js",
                 "Clipperz/PM/Components/Import/ExcelImportComponent.js",
                 "Clipperz/PM/Components/Import/PasswordPlusImportComponent.js",
                 "Clipperz/PM/Components/Import/ClipperzImportComponent.js",
                 "Clipperz/PM/Components/Import/RoboFormImportComponent.js",
                 "Clipperz/PM/Components/Import/KeePassImportComponent.js",
                 "Clipperz/PM/Components/Printing/Header.js",
                 "Clipperz/PM/Components/Printing/Record.js",
                 "Clipperz/PM/Components/Printing/Footer.js",
                 "Clipperz/PM/Components/OTP/MainComponent.js",
                 "Clipperz/PM/Components/Compact/CompactHeader.js",
                 "Clipperz/PM/Components/Compact/LoginForm.js",
                 "Clipperz/PM/Components/Compact/CompactInterface.js",
                 "Clipperz/PM/Toll.js",
                 "Clipperz/PM/Proxy.js",
                 "Clipperz/PM/Proxy/Proxy.JSON.js",
                 "Clipperz/PM/Proxy/Proxy.Offline.js",
                 "Clipperz/PM/Proxy/Proxy.Offline.DataStore.js",
                 "Clipperz/PM/Connection.js",
                 "Clipperz/PM/Crypto.js",
                 "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
@@ -127,65 +127,65 @@
                 "Clipperz/PM/UI/Common/Components/MessagePanelWithProgressBar.js",
                 "Clipperz/PM/UI/Common/Components/TabPanelComponent.js",
                 "Clipperz/PM/UI/Common/Components/Tooltip.js",
                 "Clipperz/PM/UI/Common/Components/TranslatorWidget.js",
 
                 "Clipperz/PM/UI/Common/Controllers/DirectLoginRunner.js",
                 "Clipperz/PM/UI/Common/Controllers/ProgressBarController.js",
                 "Clipperz/PM/UI/Common/Controllers/TabPanelController.js",
                 "Clipperz/PM/UI/Common/Controllers/WizardController.js",
 
                 "Clipperz/PM/UI/Web/Components/Page.js",
                 "Clipperz/PM/UI/Web/Components/PageHeader.js",
                 "Clipperz/PM/UI/Web/Components/PageFooter.js",
                 "Clipperz/PM/UI/Web/Components/LoginPage.js",
                 "Clipperz/PM/UI/Web/Components/LoginForm.js",
                 "Clipperz/PM/UI/Web/Components/LoginProgress.js",
                 "Clipperz/PM/UI/Web/Components/AppPage.js",
                 "Clipperz/PM/UI/Web/Components/UserInfoBox.js",
                 "Clipperz/PM/UI/Web/Components/TabSidePanel.js",
                 "Clipperz/PM/UI/Web/Components/GridComponent.js",
 
                 "Clipperz/PM/UI/Web/Components/ColumnManager.js",
                 "Clipperz/PM/UI/Web/Components/TextColumnManager.js",
                 "Clipperz/PM/UI/Web/Components/FaviconColumnManager.js",
                 "Clipperz/PM/UI/Web/Components/ImageColumnManager.js",
                 "Clipperz/PM/UI/Web/Components/DateColumnManager.js",
                 "Clipperz/PM/UI/Web/Components/LinkColumnManager.js",
                 "Clipperz/PM/UI/Web/Components/DirectLoginColumnManager.js",
                 "Clipperz/PM/UI/Web/Components/DirectLoginsColumnManager.js",
                 "Clipperz/PM/UI/Web/Components/DeleteObjectColumnManager.js",
                 "Clipperz/PM/UI/Web/Components/CreateNewCardSplashComponent.js",
 
                 "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
+}