locomotive_cms 0.0.4 → 1.0.0.beta
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile +15 -13
- data/README.textile +5 -4
- data/app/controllers/admin/api_contents_controller.rb +10 -1
- data/app/controllers/admin/base_controller.rb +2 -2
- data/app/controllers/admin/cross_domain_sessions_controller.rb +7 -4
- data/app/controllers/admin/current_sites_controller.rb +2 -0
- data/app/controllers/admin/imports_controller.rb +13 -19
- data/app/controllers/admin/installation_controller.rb +79 -0
- data/app/controllers/admin/pages_controller.rb +1 -1
- data/app/controllers/admin/passwords_controller.rb +2 -2
- data/app/controllers/admin/sessions_controller.rb +2 -2
- data/app/controllers/admin/sites_controller.rb +2 -0
- data/app/controllers/admin/theme_assets_controller.rb +1 -1
- data/app/controllers/application_controller.rb +1 -1
- data/app/helpers/admin/assets_helper.rb +0 -6
- data/app/helpers/admin/{login_helper.rb → box_helper.rb} +7 -3
- data/app/helpers/admin/custom_fields_helper.rb +2 -2
- data/app/models/asset_collection.rb +15 -3
- data/app/models/content_instance.rb +19 -0
- data/app/models/content_type.rb +21 -3
- data/app/models/extensions/page/tree.rb +63 -7
- data/app/models/page.rb +2 -0
- data/app/models/site.rb +15 -3
- data/app/uploaders/asset_uploader.rb +1 -1
- data/app/uploaders/theme_asset_uploader.rb +12 -1
- data/app/uploaders/theme_uploader.rb +19 -0
- data/app/views/admin/asset_collections/edit.html.haml +2 -2
- data/app/views/admin/asset_collections/new.html.haml +1 -1
- data/app/views/admin/assets/_form.html.haml +2 -2
- data/app/views/admin/content_types/_form.html.haml +2 -2
- data/app/views/admin/content_types/new.html.haml +1 -1
- data/app/views/admin/contents/_form.html.haml +2 -2
- data/app/views/admin/contents/index.html.haml +1 -1
- data/app/views/admin/cross_domain_sessions/new.html.haml +1 -1
- data/app/views/admin/current_sites/_form.html.haml +3 -3
- data/app/views/admin/current_sites/edit.html.haml +1 -1
- data/app/views/admin/errors/no_page.html.haml +1 -0
- data/app/views/admin/errors/no_site.html.haml +1 -0
- data/app/views/admin/imports/new.html.haml +11 -0
- data/app/views/admin/imports/show.html.haml +1 -1
- data/app/views/admin/installation/step_1.html.haml +24 -0
- data/app/views/admin/installation/step_2.html.haml +26 -0
- data/app/views/admin/installation/step_3.html.haml +23 -0
- data/app/views/{layouts/admin → admin/layouts}/application.html.haml +0 -0
- data/app/views/admin/layouts/box.html.haml +21 -0
- data/app/views/admin/layouts/error.html.haml +1 -0
- data/app/views/admin/my_accounts/edit.html.haml +1 -1
- data/app/views/admin/pages/_form.html.haml +2 -3
- data/app/views/admin/pages/_page.html.haml +4 -2
- data/app/views/admin/pages/index.html.haml +1 -1
- data/app/views/admin/passwords/edit.html.haml +2 -2
- data/app/views/admin/passwords/new.html.haml +2 -2
- data/app/views/admin/sessions/new.html.haml +2 -2
- data/app/views/admin/shared/_head.html.haml +4 -5
- data/app/views/admin/shared/menu/_contents.html.haml +1 -1
- data/app/views/admin/sites/_form.html.haml +3 -3
- data/app/views/admin/snippets/_form.html.haml +2 -2
- data/app/views/admin/theme_assets/_form.html.haml +2 -2
- data/app/views/admin/theme_assets/index.html.haml +1 -1
- data/config/application.rb +1 -3
- data/config/assets.yml +96 -0
- data/config/environments/development.rb +1 -6
- data/config/environments/production.rb +1 -1
- data/config/environments/test.rb +1 -5
- data/config/initializers/carrierwave.rb +17 -0
- data/config/initializers/locomotive.rb +14 -0
- data/config/locales/admin_ui_en.yml +33 -1
- data/config/locales/admin_ui_fr.yml +34 -1
- data/config/locales/default_en.yml +1 -0
- data/config/locales/default_fr.yml +1 -0
- data/config/locales/flash.en.yml +1 -0
- data/config/locales/flash.fr.yml +1 -0
- data/config/mongoid.yml +13 -5
- data/config/routes.rb +6 -1
- data/lib/generators/locomotive/install/install_generator.rb +18 -10
- data/lib/generators/locomotive/install/templates/README +23 -13
- data/lib/generators/locomotive/install/templates/locomotive.rb +15 -1
- data/lib/locomotive/carrierwave.rb +1 -0
- data/lib/locomotive/configuration.rb +3 -1
- data/lib/locomotive/custom_fields.rb +0 -1
- data/lib/locomotive/delayed_job.rb +1 -2
- data/lib/locomotive/engine.rb +24 -7
- data/lib/locomotive/heroku.rb +1 -0
- data/lib/locomotive/httparty/webservice.rb +12 -1
- data/lib/locomotive/import.rb +2 -0
- data/lib/locomotive/import/asset_collections.rb +40 -8
- data/lib/locomotive/import/assets.rb +20 -12
- data/lib/locomotive/import/base.rb +46 -0
- data/lib/locomotive/import/content_types.rb +51 -15
- data/lib/locomotive/import/job.rb +106 -11
- data/lib/locomotive/import/logger.rb +13 -0
- data/lib/locomotive/import/pages.rb +79 -26
- data/lib/locomotive/import/site.rb +3 -5
- data/lib/locomotive/import/snippets.rb +6 -8
- data/lib/locomotive/inherited_resources.rb +1 -0
- data/lib/locomotive/liquid/drops/asset_collections.rb +4 -4
- data/lib/locomotive/liquid/drops/contents.rb +21 -16
- data/lib/locomotive/liquid/drops/page.rb +4 -0
- data/lib/locomotive/liquid/filters/html.rb +15 -29
- data/lib/locomotive/liquid/tags/consume.rb +1 -1
- data/lib/locomotive/liquid/tags/nav.rb +48 -17
- data/lib/locomotive/liquid/tags/paginate.rb +3 -3
- data/lib/locomotive/middlewares/fonts.rb +3 -11
- data/lib/locomotive/misc_form_builder.rb +2 -7
- data/lib/locomotive/railties/tasks.rake +16 -0
- data/lib/locomotive/regexps.rb +1 -1
- data/lib/locomotive/render.rb +9 -3
- data/lib/locomotive/routing/site_dispatcher.rb +10 -6
- data/lib/locomotive/version.rb +1 -1
- data/public/images/admin/box/buttons/right_bg.png +0 -0
- data/public/javascripts/admin/aloha/VERSION.txt +1 -1
- data/public/javascripts/admin/aloha/aloha-nodeps.js +140 -101
- data/public/javascripts/admin/aloha/aloha.js +193 -105
- data/public/javascripts/admin/aloha/css/aloha.css +65 -4
- data/public/javascripts/admin/aloha/deps/prettyPhoto/resources/css/prettyPhoto.css +2 -2
- data/public/javascripts/admin/aloha/i18n/de.dict +2 -0
- data/public/javascripts/admin/aloha/i18n/en.dict +2 -0
- data/public/javascripts/admin/aloha/i18n/pl.dict +5 -0
- data/public/javascripts/admin/aloha/images/base.png +0 -0
- data/public/javascripts/admin/aloha/images/base_big.png +0 -0
- data/public/javascripts/admin/aloha/images/base_multi.png +0 -0
- data/public/javascripts/admin/aloha/images/fade_in.png +0 -0
- data/public/javascripts/admin/aloha/images/fade_out.png +0 -0
- data/public/javascripts/admin/aloha/images/gentics_logo.png +0 -0
- data/public/javascripts/admin/aloha/images/grabhandle.png +0 -0
- data/public/javascripts/admin/aloha/images/maximize.png +0 -0
- data/public/javascripts/admin/aloha/images/pin.png +0 -0
- data/public/javascripts/admin/aloha/images/removeformat.png +0 -0
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/examples/triSports.css +86 -0
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/examples/triSports.html +44 -0
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/i18n/de.dict +4 -0
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/i18n/en.dict +4 -0
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/i18n/fr.dict +4 -0
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/plugin.js +1 -0
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/product.js +1 -0
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/2xu-wetsuit.jpg +0 -0
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/asics-noosa.jpg +0 -0
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/fivefingers-kso.jpg +0 -0
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/kuota-kueen-k.jpg +0 -0
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/mizuno-wave-musha2.jpg +0 -0
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/product.css +69 -0
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/product_button.gif +0 -0
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/simplon-mrt.jpg +0 -0
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/trek-fuel-ex.jpg +0 -0
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/trisports.jpg +0 -0
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/zoggs-predator.jpg +0 -0
- data/public/javascripts/admin/aloha/plugins/{com.example.aloha.DummySave → com.example.aloha.plugins.Save}/i18n/de.dict +0 -0
- data/public/javascripts/admin/aloha/plugins/{com.example.aloha.DummySave → com.example.aloha.plugins.Save}/i18n/en.dict +0 -0
- data/public/javascripts/admin/aloha/plugins/{com.example.aloha.DummySave → com.example.aloha.plugins.Save}/i18n/fi.dict +0 -0
- data/public/javascripts/admin/aloha/plugins/{com.example.aloha.DummySave → com.example.aloha.plugins.Save}/i18n/fr.dict +0 -0
- data/public/javascripts/admin/aloha/plugins/{com.example.aloha.DummySave → com.example.aloha.plugins.Save}/i18n/it.dict +0 -0
- data/public/javascripts/admin/aloha/plugins/{com.example.aloha.DummySave → com.example.aloha.plugins.Save}/plugin.js +0 -0
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Abbr/examples/AlohaAbbr.css +48 -0
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Abbr/examples/AlohaAbbr.html +69 -0
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Abbr/i18n/de.dict +4 -0
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Abbr/i18n/en.dict +4 -0
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Abbr/plugin.js +7 -0
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Format/i18n/pl.dict +30 -0
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Format/plugin.js +1 -1
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.HighlightEditables/plugin.js +1 -1
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/LinkList.js +7 -0
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/delicious.js +7 -0
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/i18n/pl.dict +4 -0
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/plugin.js +1 -1
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.LinkChecker/css/LinkChecker.css +14 -0
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.LinkChecker/examples/AlohaLinkChecker.css +49 -0
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.LinkChecker/examples/AlohaLinkChecker.html +82 -0
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.LinkChecker/i18n/en.dict +27 -0
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.LinkChecker/plugin.js +7 -0
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.LinkChecker/proxy.php +235 -0
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.List/plugin.js +1 -1
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Paste/plugin.js +7 -0
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Paste/wordpastehandler.js +7 -0
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.TOC/i18n/de.dict +1 -0
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.TOC/i18n/en.dict +1 -0
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.TOC/plugin.js +1 -1
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/i18n/de.dict +2 -0
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/i18n/en.dict +2 -0
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/i18n/pl.dict +12 -0
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/plugin.js +1 -1
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/resources/table.css +28 -110
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/resources/wai_green.png +0 -0
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/resources/wai_red.png +0 -0
- data/public/javascripts/admin/asset_collections.js +11 -7
- data/public/javascripts/admin/contents.js +3 -1
- data/public/javascripts/admin/site.js +9 -3
- data/public/javascripts/admin/snippets.js +1 -1
- data/public/javascripts/admin/utils.js +5 -3
- data/public/stylesheets/admin/application.css +1 -1
- data/public/stylesheets/admin/box.css +5 -5
- data/public/stylesheets/admin/buttons.css +0 -5
- data/public/stylesheets/admin/formtastic_changes.css +5 -12
- data/public/stylesheets/admin/inline_editor.css +22 -5
- data/public/stylesheets/admin/installation.css +50 -0
- data/public/stylesheets/admin/layout.css +9 -4
- data/public/stylesheets/admin/safari.css +15 -0
- metadata +188 -131
- data/app/controllers/home_controller.rb +0 -7
- data/app/views/admin/snippets/index.html.haml +0 -15
- data/app/views/home/show.html.haml +0 -4
- data/app/views/layouts/admin/box.html.haml +0 -19
- data/app/views/layouts/application.html.haml +0 -7
- data/lib/generators/locomotive/copy_assets/copy_assets_generator.rb +0 -14
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.DummyDC/i18n/de.dict +0 -2
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.DummyDC/i18n/en.dict +0 -2
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.DummyDC/i18n/eo.dict +0 -2
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.DummyDC/i18n/fi.dict +0 -2
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.DummyDC/i18n/fr.dict +0 -2
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.DummyDC/i18n/it.dict +0 -2
- data/public/javascripts/admin/aloha/plugins/com.example.aloha.DummyDC/plugin.js +0 -7
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.GCN/i18n/de.dict +0 -20
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.GCN/i18n/en.dict +0 -20
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.GCN/i18n/eo.dict +0 -16
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.GCN/i18n/fi.dict +0 -20
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.GCN/i18n/fr.dict +0 -16
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.GCN/i18n/it.dict +0 -20
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.GCN/plugin.js +0 -7
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/css/jquery.autocomplete.css +0 -48
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/deps/jquery.autocomplete.js +0 -1
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/ressource.js +0 -7
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/ressourcedummy.js +0 -7
- data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/ressourceregistry.js +0 -7
- data/public/javascripts/admin/aloha/plugins/eu.iksproject.plugins.Loader/plugin.js +0 -1
- data/public/javascripts/admin/aloha/plugins/eu.iksproject.plugins.Person/i18n/en.dict +0 -2
- data/public/javascripts/admin/aloha/plugins/eu.iksproject.plugins.Person/i18n/fi.dict +0 -2
- data/public/javascripts/admin/aloha/plugins/eu.iksproject.plugins.Person/i18n/fr.dict +0 -2
- data/public/javascripts/admin/aloha/plugins/eu.iksproject.plugins.Person/person.css +0 -3
- data/public/javascripts/admin/aloha/plugins/eu.iksproject.plugins.Person/plugin.js +0 -1
- data/public/javascripts/admin/aloha/plugins/simpletable/plugin.js.deactivated +0 -2330
@@ -4,7 +4,9 @@
|
|
4
4
|
* aloha-sales@gentics.com
|
5
5
|
* Licensed unter the terms of http://www.aloha-editor.com/license.html
|
6
6
|
*/
|
7
|
-
.GENTICS_editable {
|
7
|
+
.GENTICS_editable {
|
8
|
+
min-height: 1.2em;
|
9
|
+
}
|
8
10
|
|
9
11
|
.GENTICS_editable_active .GENTICS_block {
|
10
12
|
background-color: #B7D6FA !important;
|
@@ -20,22 +22,53 @@
|
|
20
22
|
display: none;
|
21
23
|
}
|
22
24
|
|
25
|
+
.GENTICS_block .GENTICS_block .GENTICS_editicon {
|
26
|
+
margin-top: 15px;
|
27
|
+
}
|
28
|
+
|
29
|
+
.GENTICS_block .GENTICS_block .GENTICS_block .GENTICS_editicon {
|
30
|
+
margin-top: 30px;
|
31
|
+
}
|
32
|
+
|
33
|
+
.GENTICS_block .GENTICS_block .GENTICS_block .GENTICS_block .GENTICS_editicon {
|
34
|
+
margin-top: 45px;
|
35
|
+
}
|
36
|
+
|
23
37
|
/*
|
24
38
|
* Ext JS fixes
|
25
39
|
*/
|
26
|
-
.GENTICS_floatingmenu table, .GENTICS_floatingmenu tr, .GENTICS_floatingmenu td,
|
40
|
+
.GENTICS_floatingmenu table, .GENTICS_floatingmenu tr, .GENTICS_floatingmenu td,
|
41
|
+
.ext-root tr:nth-child(2n), .ext-root tr:nth-child(3n), .ext-root tr:nth-child(4n), .ext-root tr:nth-child(5n),
|
42
|
+
.ext-root table, .ext-root tr, .ext-root td,
|
43
|
+
.x-layer table, .x-layer tr, .x-layer td,
|
44
|
+
.x-window table, .x-window tr, .x-window td {
|
27
45
|
border: 0;
|
28
46
|
padding: 0;
|
29
47
|
margin: 0;
|
48
|
+
background-color: transparent;
|
30
49
|
}
|
31
50
|
.GENTICS_floatingmenu table, .GENTICS_floatingmenu tr, .GENTICS_floatingmenu td {
|
32
51
|
width: 0;
|
33
52
|
height: 0;
|
34
53
|
}
|
35
54
|
|
55
|
+
/* fixes modal dialog border issues in GCN backend */
|
56
|
+
table.x-toolbar-ct {
|
57
|
+
border: 0px;
|
58
|
+
}
|
59
|
+
|
60
|
+
table.x-toolbar-ct td {
|
61
|
+
border: 0px;
|
62
|
+
}
|
63
|
+
|
64
|
+
table.x-toolbar-ct table {
|
65
|
+
border: 0px;
|
66
|
+
}
|
67
|
+
|
36
68
|
/*
|
37
69
|
* Floating Menu
|
38
70
|
*/
|
71
|
+
|
39
72
|
.GENTICS_floatingmenu .x-tab-panel-header {
|
40
73
|
border-width: 0px 0px 1px 0px;
|
41
74
|
background: none;
|
@@ -86,6 +119,22 @@
|
|
86
119
|
z-index: 8800;
|
87
120
|
}
|
88
121
|
|
122
|
+
.x-combo-selected {
|
123
|
+
background-color: Highlight !important;
|
124
|
+
}
|
125
|
+
|
126
|
+
.x-tree-root-ct {
|
127
|
+
padding: 0px;
|
128
|
+
}
|
129
|
+
|
130
|
+
.x-tree-node {
|
131
|
+
list-style: none;
|
132
|
+
}
|
133
|
+
|
134
|
+
.x-tree-node-ct {
|
135
|
+
padding: 0px;
|
136
|
+
}
|
137
|
+
|
89
138
|
/*hide dotted browser border on focus*/
|
90
139
|
.GENTICS_button a:focus {
|
91
140
|
outline: none;
|
@@ -95,6 +144,10 @@ button.GENTICS_button {
|
|
95
144
|
background: url(../images/base.png) no-repeat !important;
|
96
145
|
}
|
97
146
|
|
147
|
+
button.GENTICS_button_big {
|
148
|
+
background: url(../images/base_big.png) no-repeat !important;
|
149
|
+
}
|
150
|
+
|
98
151
|
/*buttons for format plugin*/
|
99
152
|
button.GENTICS_button_b {
|
100
153
|
background-position: 0px 0px;
|
@@ -239,7 +292,7 @@ button.GENTICS_button_deleteRows {
|
|
239
292
|
button.GENTICS_button_deleteColumns {
|
240
293
|
background-position: -192px 0 !important;
|
241
294
|
}
|
242
|
-
|
295
|
+
/* iks test buttons */
|
243
296
|
button.GENTICS_button_addPerson {
|
244
297
|
background-position: -224px 0 !important;
|
245
298
|
}
|
@@ -248,6 +301,13 @@ button.GENTICS_button_addEvent {
|
|
248
301
|
background-position: -208px 0 !important;
|
249
302
|
}
|
250
303
|
|
304
|
+
button.GENTICS_button_abbr {
|
305
|
+
background-position: -336px 0px !important;
|
306
|
+
}
|
307
|
+
button.GENTICS_button_tree {
|
308
|
+
background-position: -0 0 !important;
|
309
|
+
}
|
310
|
+
|
251
311
|
/*button status hover of format plugin*/
|
252
312
|
div.GENTICS_button a:hover {
|
253
313
|
border: 1px solid #b2cbff;
|
@@ -405,4 +465,5 @@ ul.GENTICS_multisplit-expanded {
|
|
405
465
|
|
406
466
|
ul.GENTICS_multisplit button.GENTICS_button_removeFormat {
|
407
467
|
background-image: url(../images/removeformat.png) !important;
|
408
|
-
}
|
468
|
+
}
|
469
|
+
|
@@ -168,14 +168,14 @@
|
|
168
168
|
position: absolute;
|
169
169
|
top: 0;
|
170
170
|
width: 100%;
|
171
|
-
z-index:
|
171
|
+
z-index: 19500;
|
172
172
|
}
|
173
173
|
|
174
174
|
div.pp_pic_holder {
|
175
175
|
display: none;
|
176
176
|
position: absolute;
|
177
177
|
width: 100px;
|
178
|
-
z-index:
|
178
|
+
z-index: 20000;
|
179
179
|
}
|
180
180
|
|
181
181
|
.pp_top {
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/examples/triSports.css
ADDED
@@ -0,0 +1,86 @@
|
|
1
|
+
body {
|
2
|
+
font-family: sans-serif;
|
3
|
+
}
|
4
|
+
|
5
|
+
body {
|
6
|
+
background-color: #ccc;
|
7
|
+
}
|
8
|
+
|
9
|
+
#bodyContent {
|
10
|
+
font-size:0.8em;
|
11
|
+
}
|
12
|
+
|
13
|
+
h1, h2, h3, h4, h5, h6 {
|
14
|
+
font-family: sans-serif;
|
15
|
+
color: #1c94c4;
|
16
|
+
border-bottom:1px solid #AAAAAA;
|
17
|
+
padding-bottom:0.17em;
|
18
|
+
padding-top:0.5em;
|
19
|
+
}
|
20
|
+
|
21
|
+
h1 { font-size: 188%; }
|
22
|
+
h2 { font-size: 150%; }
|
23
|
+
h3 { font-size: 132%; }
|
24
|
+
h4 { font-size: 116%; }
|
25
|
+
h5 { font-size: 100%; }
|
26
|
+
h6 { font-size: 80%; }
|
27
|
+
|
28
|
+
#main {
|
29
|
+
width: 50%;
|
30
|
+
position: absolute;
|
31
|
+
top: 10%;
|
32
|
+
left: 25%;
|
33
|
+
padding: 30px;
|
34
|
+
background-color: white;
|
35
|
+
border-radius: 10px;
|
36
|
+
color: #444444;
|
37
|
+
-moz-border-radius: 10px;
|
38
|
+
box-shadow: 5px 5px rgba(0,0,0,0.3);
|
39
|
+
-webkit-box-shadow: 5px 5px rgba(0,0,0,0.3);
|
40
|
+
-moz-box-shadow: 5px 5px rgba(0,0,0,0.3);
|
41
|
+
}
|
42
|
+
|
43
|
+
a.aloha {
|
44
|
+
background: url(images/external-link-ltr-icon.png) no-repeat 100% 50%;
|
45
|
+
padding: 0px 13px 0px 0px;
|
46
|
+
}
|
47
|
+
|
48
|
+
::selection {
|
49
|
+
background: #b8d6fa;
|
50
|
+
}
|
51
|
+
|
52
|
+
#main {
|
53
|
+
width: 640px;
|
54
|
+
}
|
55
|
+
|
56
|
+
h1, h2, h3 {
|
57
|
+
border: 0;
|
58
|
+
}
|
59
|
+
|
60
|
+
.nav {
|
61
|
+
font-weight: bold;
|
62
|
+
background: rgba(255,255,255,0.8);
|
63
|
+
width: 680px;
|
64
|
+
margin: -60px 0 0 -30px;
|
65
|
+
padding: 3px 10px;
|
66
|
+
z-index: 100;
|
67
|
+
position: absolute;
|
68
|
+
}
|
69
|
+
|
70
|
+
.nav a {
|
71
|
+
color: #1e94c4;
|
72
|
+
}
|
73
|
+
|
74
|
+
#logo {
|
75
|
+
margin: -30px 0 30px -30px;
|
76
|
+
-webkit-border-radius: 10px 10px 0 0;
|
77
|
+
-moz-border-radius: 10px 10px 0 0;
|
78
|
+
border-radius: 10px 10px 0 0;
|
79
|
+
boder: 0px;
|
80
|
+
z-index: 90;
|
81
|
+
}
|
82
|
+
|
83
|
+
#bodyContent {
|
84
|
+
margin-top: -30px;
|
85
|
+
}
|
86
|
+
|
@@ -0,0 +1,44 @@
|
|
1
|
+
<!DOCTYPE html>
|
2
|
+
<html>
|
3
|
+
<head>
|
4
|
+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
5
|
+
<title>triSports Online Shop</title>
|
6
|
+
<script>GENTICS_Aloha_base = "../../../";</script>
|
7
|
+
<script type="text/javascript" src="../../../core/include.js"></script>
|
8
|
+
<script type="text/javascript" src="../../com.gentics.aloha.plugins.Format/plugin.js"></script>
|
9
|
+
<script type="text/javascript" src="../../com.gentics.aloha.plugins.HighlightEditables/plugin.js"></script>
|
10
|
+
<script type="text/javascript" src="../../com.gentics.aloha.plugins.Link/plugin.js"></script>
|
11
|
+
<script type="text/javascript" src="../../com.gentics.aloha.plugins.Link/LinkList.js"></script>
|
12
|
+
<script type="text/javascript" src="../plugin.js"></script>
|
13
|
+
<script type="text/javascript" src="../product.js"></script>
|
14
|
+
|
15
|
+
<link rel="stylesheet" href="triSports.css" />
|
16
|
+
|
17
|
+
<!-- turn an element into editable Aloha continuous text -->
|
18
|
+
<script type="text/javascript">
|
19
|
+
GENTICS.Aloha.settings = {
|
20
|
+
ribbon: false
|
21
|
+
};
|
22
|
+
$(document).ready(function() {
|
23
|
+
$('#content').aloha();
|
24
|
+
$('#products').aloha();
|
25
|
+
});
|
26
|
+
</script>
|
27
|
+
</head>
|
28
|
+
<body>
|
29
|
+
<div id="main">
|
30
|
+
<img id="logo" src="../resources/trisports.jpg" />
|
31
|
+
<div class="nav"><a href="#">Online Shop</a> | <a href="#">Delivery</a> | <a href="#" style="color:red;">Sale!</a> | <a href="#">My Account</a></div>
|
32
|
+
<div id="bodyContent">
|
33
|
+
<div id="content" class="article">
|
34
|
+
<h1>Welcome to triSports!</h1>
|
35
|
+
<p>Welcom to the world of <b>triSports</b>! Feel free to browse our fabulous online shop - it's an absolute blast!</p>
|
36
|
+
</div>
|
37
|
+
<div id="products">
|
38
|
+
<p><b>TOP!</b> Featured Products</p>
|
39
|
+
<p style="clear: both"></p>
|
40
|
+
</div>
|
41
|
+
</div>
|
42
|
+
</div>
|
43
|
+
</body>
|
44
|
+
</html>
|
@@ -0,0 +1 @@
|
|
1
|
+
if(typeof EXAMPLE=="undefined"||!EXAMPLE){var EXAMPLE={}}EXAMPLE.Product=new GENTICS.Aloha.Plugin("com.example.aloha.plugins.Product");EXAMPLE.Product.languages=["en","de","fr"];EXAMPLE.Product.productField=null;EXAMPLE.Product.init=function(){var that=this;jQuery("head").append('<link rel="stylesheet" type="text/css" href="'+GENTICS.Aloha.settings.base+'/plugins/com.example.aloha.plugins.Product/resources/product.css">');var insertButton=new GENTICS.Aloha.ui.Button({iconClass:"GENTICS_button GENTICS_button_product",size:"small",onclick:function(){that.insertProduct()},tooltip:this.i18n("button.insertproduct"),toggle:false});GENTICS.Aloha.FloatingMenu.addButton("GENTICS.Aloha.continuoustext",insertButton,GENTICS.Aloha.i18n(GENTICS.Aloha,"floatingmenu.tab.insert"),1);GENTICS.Aloha.FloatingMenu.createScope(this.getUID("product"),"GENTICS.Aloha.global");this.productField=new GENTICS.Aloha.ui.AttributeField();this.productField.setTemplate('<span><b>{name}</b><span class="product-preview" style="background-image: url('+GENTICS.Aloha.settings.base+'{url});"></span><br class="clear" /><i>{type}</i></span>');this.productField.setObjectTypeFilter(["product"]);this.productField.setDisplayField("name");GENTICS.Aloha.FloatingMenu.addButton(this.getUID("product"),this.productField,this.i18n("floatingmenu.tab.product"),1);GENTICS.Aloha.EventRegistry.subscribe(GENTICS.Aloha,"selectionChanged",function(event,rangeObject){var foundMarkup=that.findProduct(rangeObject);jQuery(".product-selected").removeClass("product-selected");if(foundMarkup.length!=0){GENTICS.Aloha.FloatingMenu.setScope(that.getUID("product"));that.productField.setTargetObject(foundMarkup,"data-product-name");foundMarkup.addClass("product-selected")}GENTICS.Aloha.FloatingMenu.doLayout()});GENTICS.Aloha.EventRegistry.subscribe(GENTICS.Aloha,"editableDeactivated",function(jEvent,aEvent){jQuery(".product-selected").removeClass("product-selected")})};EXAMPLE.Product.findProduct=function(range){return jQuery(range.commonAncestorContainer).closest(".GENTICS_block.product")};EXAMPLE.Product.insertProduct=function(){GENTICS.Aloha.FloatingMenu.userActivatedTab=this.i18n("floatingmenu.tab.product");var range=GENTICS.Aloha.Selection.getRangeObject();var newProduct=jQuery('<div class="GENTICS_block product" contentEditable="false"><div class="image"></div><div class="name">'+this.i18n("newproductname")+"</div></div>");GENTICS.Utils.Dom.insertIntoDOM(newProduct,range,jQuery(GENTICS.Aloha.activeEditable.obj));range.startContainer=range.endContainer=newProduct.contents().get(0);range.select();this.productField.focus()};EXAMPLE.Product.updateProduct=function(obj,resourceItem){obj.find(".name").text(resourceItem.name);obj.find(".image").css("backgroundImage","url("+GENTICS.Aloha.settings.base+resourceItem.url+")")};
|
@@ -0,0 +1 @@
|
|
1
|
+
if(!GENTICS.Aloha.Repositories){GENTICS.Aloha.Repositories={}}GENTICS.Aloha.Repositories.Product=new GENTICS.Aloha.Repository("com.gentics.aloha.resources.Product");GENTICS.Aloha.Repositories.Product.settings.data=[{id:1,name:"Kuota Kueen K",url:"/plugins/com.example.aloha.plugins.Product/resources/kuota-kueen-k.jpg",type:"product"},{id:2,name:"2XU Wetsuit",url:"/plugins/com.example.aloha.plugins.Product/resources/2xu-wetsuit.jpg",type:"product"},{id:3,name:"Asics Noosa Tri",url:"/plugins/com.example.aloha.plugins.Product/resources/asics-noosa.jpg",type:"product"},{id:4,name:"Mizuno Wave Musha 2",url:"/plugins/com.example.aloha.plugins.Product/resources/mizuno-wave-musha2.jpg",type:"product"},{id:5,name:"Simplon Mr. T",url:"/plugins/com.example.aloha.plugins.Product/resources/simplon-mrt.jpg",type:"product"},{id:6,name:"Zoggs Predator",url:"/plugins/com.example.aloha.plugins.Product/resources/zoggs-predator.jpg",type:"product"},{id:7,name:"Fivefingers KSO",url:"/plugins/com.example.aloha.plugins.Product/resources/fivefingers-kso.jpg",type:"product"},{id:8,name:"Trek Fuel EX",url:"/plugins/com.example.aloha.plugins.Product/resources/trek-fuel-ex.jpg",type:"product"}];GENTICS.Aloha.Repositories.Product.query=function(p,callback){var d=this.settings.data.filter(function(e,i,a){var r=new RegExp(p.queryString,"i");return(jQuery.inArray(e.type,p.objectTypeFilter)>-1&&(e.name.match(r)||e.url.match(r)))});callback.call(this,d)};GENTICS.Aloha.Repositories.Product.markObject=function(obj,resourceItem){EXAMPLE.Product.updateProduct(obj,resourceItem)};
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/product.css
ADDED
@@ -0,0 +1,69 @@
|
|
1
|
+
/**
|
2
|
+
* product
|
3
|
+
*/
|
4
|
+
.GENTICS_button.GENTICS_button_product {
|
5
|
+
background: red url(product_button.gif) no-repeat !important;
|
6
|
+
}
|
7
|
+
|
8
|
+
.GENTICS_block.product {
|
9
|
+
width: 156px;
|
10
|
+
height: 170px;
|
11
|
+
border: 2px solid #dfdfdf;
|
12
|
+
padding: 10px;
|
13
|
+
display: inline-block;
|
14
|
+
-webkit-border-radius: 2px;
|
15
|
+
-moz-border-radius: 2px;
|
16
|
+
border-radius: 2px;
|
17
|
+
-webkit-box-shadow: rgba(0, 0, 0, 0.1) 5px 5px 20px;
|
18
|
+
-moz-box-shadow: rgba(0, 0, 0, 0.1) 5px 5px 20px;
|
19
|
+
box-shadow: rgba(0, 0, 0, 0.1) 5px 5px 20px;
|
20
|
+
float: left;
|
21
|
+
margin: 0 32px 30px 0;
|
22
|
+
background: white;
|
23
|
+
background: -webkit-gradient(
|
24
|
+
linear,
|
25
|
+
left bottom,
|
26
|
+
left top,
|
27
|
+
color-stop(0, rgb(239,239,239)),
|
28
|
+
color-stop(0.3, rgb(255,255,255)),
|
29
|
+
color-stop(0.7, rgb(255,255,255)),
|
30
|
+
color-stop(1, rgb(250,250,250))
|
31
|
+
);
|
32
|
+
background: -moz-linear-gradient(
|
33
|
+
center bottom,
|
34
|
+
rgb(239,239,239) 0%,
|
35
|
+
rgb(255,255,255) 30%,
|
36
|
+
rgb(255,255,255) 70%,
|
37
|
+
rgb(250,250,250) 100%
|
38
|
+
);
|
39
|
+
}
|
40
|
+
|
41
|
+
.GENTICS_block.product .image {
|
42
|
+
width: 150px;
|
43
|
+
height: 130px;
|
44
|
+
background: white no-repeat center center;
|
45
|
+
margin-bottom: 12px;
|
46
|
+
-webkit-box-shadow: inset 0px 0px 10px rgba(0,0,0,0.1);
|
47
|
+
-moz-box-shadow: inset 0px 0px 10px rgba(0,0,0,0.1);
|
48
|
+
box-shadow: inset 0px 0px 10px rgba(0,0,0,0.1);
|
49
|
+
border: 2px solid #dfdfdf;
|
50
|
+
}
|
51
|
+
|
52
|
+
.GENTICS_block.product .name {
|
53
|
+
color: #666;
|
54
|
+
text-align: center;
|
55
|
+
text-shadow: white 1px 1px 1px;
|
56
|
+
}
|
57
|
+
|
58
|
+
.GENTICS_block.product.product-selected {
|
59
|
+
background: #b8d6fa !important;
|
60
|
+
}
|
61
|
+
|
62
|
+
.product-preview {
|
63
|
+
display: inline-block;
|
64
|
+
float: right;
|
65
|
+
width: 30px;
|
66
|
+
height: 30px;
|
67
|
+
background: white no-repeat center center;
|
68
|
+
border: 2px solid #efefef;
|
69
|
+
}
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Abbr/examples/AlohaAbbr.css
ADDED
@@ -0,0 +1,48 @@
|
|
1
|
+
body {
|
2
|
+
font-family: sans-serif;
|
3
|
+
}
|
4
|
+
|
5
|
+
body {
|
6
|
+
background-color: #ccc;
|
7
|
+
}
|
8
|
+
|
9
|
+
#bodyContent {
|
10
|
+
font-size:0.9em;
|
11
|
+
}
|
12
|
+
|
13
|
+
h1, h2, h3, h4, h5, h6 {
|
14
|
+
font-family: sans-serif;
|
15
|
+
padding-bottom:0.1em;
|
16
|
+
padding-top:0.5em;
|
17
|
+
}
|
18
|
+
h1 {
|
19
|
+
border-bottom:1px solid #AAAAAA;
|
20
|
+
}
|
21
|
+
|
22
|
+
h1 { font-size: 188%; }
|
23
|
+
h2 { font-size: 150%; }
|
24
|
+
h3 { font-size: 132%; }
|
25
|
+
h4 { font-size: 116%; }
|
26
|
+
h5 { font-size: 100%; }
|
27
|
+
h6 { font-size: 80%; }
|
28
|
+
|
29
|
+
#main {
|
30
|
+
width: 650px;
|
31
|
+
margin-top: 40px;
|
32
|
+
margin-left: auto ;
|
33
|
+
margin-right: auto ;
|
34
|
+
padding: 70px;
|
35
|
+
background-color: white;
|
36
|
+
border-radius: 1px;
|
37
|
+
-moz-border-radius: 1px;
|
38
|
+
box-shadow: 5px 5px rgba(0,0,0,0.3);
|
39
|
+
-webkit-box-shadow: 5px 5px rgba(0,0,0,0.3);
|
40
|
+
-moz-box-shadow: 5px 5px rgba(0,0,0,0.3);
|
41
|
+
}
|
42
|
+
|
43
|
+
abbr, acronym
|
44
|
+
{
|
45
|
+
border-bottom: .1em dotted;
|
46
|
+
cursor: help;
|
47
|
+
}
|
48
|
+
|