Skip to content

E
ecommerce-ui
Commit 8fa03bda authored by Sven Franck's avatar Sven Franck
Browse files
Options

updated Fontawesome to latest 4.0.3, updated custom file

parent 663942ed
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 339 additions and 371 deletions
css/themes.css
View file @ 8fa03bda
......@@ -1007,7 +1007,7 @@ html .ui-btn, label.ui-btn {
.ui-btn-icon-left:after,
.ui-btn-icon-right:after,
.ui-listview > li > .ui-btn[class*="ui-icon-"]:after {
margin-top: -15px;
margin-top: -10px;
}
/* reset fix */
.ui-nosvg .ui-btn-icon-notext:after,
......
data/global.json
View file @ 8fa03bda
......@@ -115,12 +115,12 @@
"children": [
{"type": "item", "href": "#dashboard", "left": {"icon": "home"}, "center": {"text": [{"type": "h1", "text": "Home", "text_i18n": "global_dict.home"}, {"type": "p", "text": "Your Dashboard", "text_i18n": "global_dict.dashboard"}]}},
{"type": "item", "href": "#person", "left": {"icon":"user"}, "center": {"text": [{"type": "h1", "text": "My Account", "text_i18n": "global_dict.person"}, {"type": "p", "text": "Administration of your personal info", "text_i18n": "global_dict.person_subtitle"}]}},
{"type": "item", "href": "#invoices", "left": {"icon":"file-text-alt"}, "center": {"text": [{"type":"h1", "text": "My Invoices", "text_i18n": "global_dict.invoices"}, {"type": "p", "text": "Administration of your invoices", "text_i18n":"global_dict.invoices_subtitle"}]}},
{"type": "item", "href": "#servers", "left": {"icon":"hdd"}, "center": {"text": [{"type":"h1", "text": "My Servers", "text_i18n": "global_dict.servers"}, {"type":"p", "text": "Administration of your Servers", "text_i18n": "global_dict.servers_subtitle"}]}},
{"type": "item", "href": "#invoices", "left": {"icon":"file-text"}, "center": {"text": [{"type":"h1", "text": "My Invoices", "text_i18n": "global_dict.invoices"}, {"type": "p", "text": "Administration of your invoices", "text_i18n":"global_dict.invoices_subtitle"}]}},
{"type": "item", "href": "#servers", "left": {"icon":"hdd-o"}, "center": {"text": [{"type":"h1", "text": "My Servers", "text_i18n": "global_dict.servers"}, {"type":"p", "text": "Administration of your Servers", "text_i18n": "global_dict.servers_subtitle"}]}},
{"type": "item", "href": "#services", "left": {"icon":"cogs"}, "center": {"text": [{"type": "h1","text": "My Services", "text_i18n":"global_dict.services"},{"type": "p", "text": "Administration of your Services", "text_i18n":"global_dict.services_subtitle"}]}},
{"type": "item", "href": "#networks", "left": {"icon":"sitemap"}, "center": {"text":[{"type": "h1", "text": "My Networks", "text_i18n": "global_dict.networks"},{"type": "p", "text":"Administration of your networks", "text_i18n":"global_dict.networks_subtitle"}]}},
{"type": "item", "href": "#monitoring", "left": {"icon":"bar-chart"}, "center": {"text":[{"type":"h1", "text": "Monitoring", "text_i18n":"global_dict.monitoring"},{"type":"p", "text": "Server Status Reports", "text_i18n": "global_dict.monitoring_subtitle"}]}},
{"type": "item", "href": "#help", "left": {"icon":"question-sign"}, "center": {"text": [{"type": "h1", "text": "Help", "text_i18n": "global_dict.help"},{"type": "p", "text": "Contact Customer Support", "text_i18n": "global_dict.help_subtitle"}]}},
{"type": "item", "href": "#monitoring", "left": {"icon":"bar-chart-o"}, "center": {"text":[{"type":"h1", "text": "Monitoring", "text_i18n":"global_dict.monitoring"},{"type":"p", "text": "Server Status Reports", "text_i18n": "global_dict.monitoring_subtitle"}]}},
{"type": "item", "href": "#help", "left": {"icon":"question"}, "center": {"text": [{"type": "h1", "text": "Help", "text_i18n": "global_dict.help"},{"type": "p", "text": "Contact Customer Support", "text_i18n": "global_dict.help_subtitle"}]}},
{"type": "item", "href": "#about", "left": {"icon": "book"}, "center": {"text": [{"type": "h1", "text": "About", "text_i18n": "global_dict.about"}, {"type": "p", "text": "Request further information", "text_i18n": "global_dict.about_subtitle"}]}}
]
}, {
......@@ -154,7 +154,7 @@
"direction": "horizontal"
},
"children": [
{"type":"a", "direct": {"href": "#global-panel", "className":"responsive translate"}, "attributes": {"data-rel":"panel", "data-icon":"reorder", "data-i18n":"global_dict.menu"},"logic": {"text":"Menu"}}
{"type":"a", "direct": {"href": "#global-panel", "className":"responsive translate"}, "attributes": {"data-rel":"panel", "data-icon":"bars", "data-i18n":"global_dict.menu"},"logic": {"text":"Menu"}}
]
},{
"generate": "widget",
......
data/invoice_overview.json
View file @ 8fa03bda
......@@ -51,7 +51,7 @@
{"field": "total_price", "show": true, "persist": true},
{"field": "price_currency", "show": "true", "priority": 4, "merge": "total_price"},
{"field": "translated_simulation_state_title", "show":"true", "priority": 5},
{"custom": true, "show": true, "persist": true, "action_list": [{"class_list": "action translate", "action": "download", "icon":"file-alt", "text": "Download", "text_i18n":"portable_type_dict.invoice_dict.download"}]}
{"custom": true, "show": true, "persist": true, "action_list": [{"class_list": "action translate", "action": "download", "icon":"file-text-o", "text": "Download", "text_i18n":"portable_type_dict.invoice_dict.download"}]}
]
}
],
......
data/service_instance_status.json
View file @ 8fa03bda
......@@ -46,8 +46,8 @@
{
"custom": true,
"action_list": [
{"setters": ["data-method", "href"], "setValues":[["_actions", "destroy", "method"], ["_actions", "destroy", "href"]], "class_list": "action error status translate", "iconpos": "left", "action": "destroy", "icon":"trash", "text": "Destroy", "text_i18n":"portal_type_dict.service_dict.text_dict.destroy"},
{"setters": ["data-method", "href"], "setValues":[["_actions", "stop", "method"], ["_actions", "stop", "href"]], "class_list": "action error status translate", "iconpos": "left", "action": "stop", "icon":"ban-circle", "text": "Stop", "text_i18n":"portal_type_dict.service_dict.text_dict.stop"},
{"setters": ["data-method", "href"], "setValues":[["_actions", "destroy", "method"], ["_actions", "destroy", "href"]], "class_list": "action error status translate", "iconpos": "left", "action": "destroy", "icon":"trash-o", "text": "Destroy", "text_i18n":"portal_type_dict.service_dict.text_dict.destroy"},
{"setters": ["data-method", "href"], "setValues":[["_actions", "stop", "method"], ["_actions", "stop", "href"]], "class_list": "action error status translate", "iconpos": "left", "action": "stop", "icon":"ban", "text": "Stop", "text_i18n":"portal_type_dict.service_dict.text_dict.stop"},
{"setters": ["data-method", "href"], "setValues":[["_actions", "start", "method"], ["_actions", "start", "href"]], "class_list": "action ui-btn-slapos-black translate", "iconpos": "left", "action": "start", "icon":"cogs", "text": "Start", "text_i18n":"portal_type_dict.service_dict.text_dict.start"}
]
}
......
index.html
View file @ 8fa03bda
......@@ -8,10 +8,11 @@
<!--<link rel="stylesheet" href="ext/plugins/normalize/normalize.css">-->
<link rel="stylesheet" href="ext/libs/jquery-mobile/jquery-mobile.css">
<link rel="stylesheet" href="ext/libs/jquery-mobile/extensions.css">
<link rel="stylesheet" href="ext/plugins/fontawesome/css/MOD_fontawesome.css">
<link rel="stylesheet" href="ext/plugins/fontawesome/MOD_fontawesome.css">
<link rel="stylesheet" href="css/themes.css">
<link rel="stylesheet" href="css/css.css">
<!-- JQM -->
<script type="text/javascript" src="ext/libs/jquery/jquery.js"></script>
<script type="text/javascript" src="ext/libs/jquery-mobile/jquery-mobile.js"></script>
<script type="text/javascript" src="ext/libs/jquery-mobile/extensions.js"></script>
......@@ -27,7 +28,7 @@
<script type="text/javascript" src="ext/libs/jio/replicatestorage.js"></script>
<script type="text/javascript" src="ext/libs/jio/erp5storage.js"></script>
<!-- plugins -->
<!-- 3rd party plugins -->
<script type="text/javascript" src="js/plugins/state/state.js"></script>
<script type="text/javascript" src="js/plugins/validval/jquery.validVal.js"></script>
<script type="text/javascript" src="js/plugins/i18next/i18next.js"></script>
......@@ -35,9 +36,9 @@
<script type="text/javascript" src="js/plugins/selectivzr/selectivzr.js"></script>
<script type="text/javascript" src="js/plugins/hellojs/hellojs.js"></script>
<!-- <script type="text/javascript" src="js/plugins/jspdf/jspdf.js"></script> -->
<script type="text/javascript" src="js/shims.js"></script>
<!-- stuff happens here -->
<script type="text/javascript" src="js/shims.js"></script>
<script type="text/javascript" data-storage="data/storages.json" data-config="data/global.json" src="js/erp5_loader.js"></script>
</head>
......
js/erp5_loader.js
View file @ 8fa03bda
......@@ -2403,7 +2403,7 @@
"type":"select",
"direct":{"id": "select_" + util.uuid(), "className": "action"},
"attributes": {
"data-icon":"reorder",
"data-icon":"bars",
"data-action":"limit",
"data-iconpos":"notext"
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7