Skip to content

S
slapos.core
Commit be11a1bd authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼 Committed by Rafael Monnerat
Browse files
Options

slapos_jio: update panel and use PNG logo instead of hardcoded base64 logo

parent 923b4363
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 206 additions and 171 deletions
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_panel_html.html
View file @ be11a1bd
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
<html> <html>
<head> <head>
<!-- <!--
data-i18n=Home data-i18n=Services
data-i18n=Dashboard
data-i18n=Login Account data-i18n=Login Account
data-i18n=Tickets data-i18n=Tickets
data-i18n=Sites data-i18n=Sites
data-i18n=Projects data-i18n=Projects
data-i18n=Invoices data-i18n=Invoices
data-i18n=Services
data-i18n=Servers data-i18n=Servers
data-i18n=Networks data-i18n=Networks
data-i18n=Logout data-i18n=Logout
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</div> </div>
</div> </div>
<div class="panel_img"> <div class="panel_img">
<img class="ui-title" alt="ERP5" src="gadget_slapos_panel.png?format=png"/> <img class="ui-title" alt="SlapOS logo" src="gadget_slapos_panel.png?format=png"/>
</div> </div>
</div> </div>
</script> </script>
...@@ -54,13 +54,13 @@ ...@@ -54,13 +54,13 @@
<script id="panel-template-body" type="text/x-handlebars-template"> <script id="panel-template-body" type="text/x-handlebars-template">
<div class="ui-content"> <div class="ui-content">
<ul data-role="listview" class="ui-listview" data-enhanced="true"> <ul data-role="listview" class="ui-listview" data-enhanced="true">
<li class="ui-first-child"><a href="#?editable=true" class="ui-btn ui-btn-icon-left ui-icon-home" data-i18n="Home" accesskey="h">Home</a></li> <li class="ui-first-child"><a href="{{hosting_subscription_href}}" class="ui-btn ui-btn-icon-left ui-icon-home" data-i18n="Services" accesskey="l">Services</a></li>
<li><a href="{{dashboard_href}}" class="ui-btn ui-btn-icon-left ui-icon-gears" data-i18n="Dashboard" accesskey="h">Dashboard</a></li>
<li><a href="{{person_href}}" class="ui-btn ui-btn-icon-left ui-icon-user" data-i18n="Login Account" accesskey="p">Account</a></li> <li><a href="{{person_href}}" class="ui-btn ui-btn-icon-left ui-icon-user" data-i18n="Login Account" accesskey="p">Account</a></li>
<li><a href="{{support_request_href}}" class="ui-btn ui-btn-icon-left ui-icon-comments" data-i18n="Tickets" accesskey="t">Tickets</a></li> <li><a href="{{support_request_href}}" class="ui-btn ui-btn-icon-left ui-icon-comments" data-i18n="Tickets" accesskey="t">Tickets</a></li>
<li><a href="{{organisation_href}}" class="ui-btn ui-btn-icon-left ui-icon-map-marker" data-i18n="Sites" accesskey="k">Sites</a></li> <li><a href="{{organisation_href}}" class="ui-btn ui-btn-icon-left ui-icon-map-marker" data-i18n="Sites" accesskey="k">Sites</a></li>
<li><a href="{{project_href}}" class="ui-btn ui-btn-icon-left ui-icon-cubes" data-i18n="Projects" accesskey="w">Projects</a></li> <li><a href="{{project_href}}" class="ui-btn ui-btn-icon-left ui-icon-cubes" data-i18n="Projects" accesskey="w">Projects</a></li>
<li><a href="{{accounting_href}}" class="ui-btn ui-btn-icon-left ui-icon-credit-card" data-i18n="Invoices" accesskey="i">Invoices</a></li> <li><a href="{{accounting_href}}" class="ui-btn ui-btn-icon-left ui-icon-credit-card" data-i18n="Invoices" accesskey="i">Invoices</a></li>
<li><a href="{{hosting_subscription_href}}" class="ui-btn ui-btn-icon-left ui-icon-gears" data-i18n="Services" accesskey="l">Services</a></li>
<li><a href="{{computer_href}}" class="ui-btn ui-btn-icon-left ui-icon-database" data-i18n="Servers" accesskey="c">Servers</a></li> <li><a href="{{computer_href}}" class="ui-btn ui-btn-icon-left ui-icon-database" data-i18n="Servers" accesskey="c">Servers</a></li>
<li><a href="{{computer_network_href}}" class="ui-btn ui-btn-icon-left ui-icon-globe" data-i18n="Networks" accesskey="n">Networks</a></li> <li><a href="{{computer_network_href}}" class="ui-btn ui-btn-icon-left ui-icon-globe" data-i18n="Networks" accesskey="n">Networks</a></li>
<li><a href="{{language_href}}" class="ui-btn ui-btn-icon-left ui-icon-language" data-i18n="Language" accesskey="a">Language</a></li> <li><a href="{{language_href}}" class="ui-btn ui-btn-icon-left ui-icon-language" data-i18n="Language" accesskey="a">Language</a></li>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_panel_html.xml
View file @ be11a1bd
...@@ -63,6 +63,14 @@ ...@@ -63,6 +63,14 @@
</tuple> </tuple>
</value> </value>
</item> </item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>contributor/person_module/20200810-4679F50</string>
</tuple>
</value>
</item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <value>
...@@ -226,7 +234,7 @@ ...@@ -226,7 +234,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>zope</string> </value> <value> <string>superthomas</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -240,7 +248,7 @@ ...@@ -240,7 +248,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>986.65492.29271.38877</string> </value> <value> <string>988.27906.32629.56507</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -258,7 +266,7 @@ ...@@ -258,7 +266,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1601549406.38</float> <float>1607071619.81</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_panel_js.js
View file @ be11a1bd
...@@ -93,6 +93,7 @@ ...@@ -93,6 +93,7 @@
context.getUrlFor({command: 'display', options: {page: "slap_network_list", editable: true}}), context.getUrlFor({command: 'display', options: {page: "slap_network_list", editable: true}}),
context.getUrlFor({command: 'display', options: {page: "slap_project_list", editable: true}}), context.getUrlFor({command: 'display', options: {page: "slap_project_list", editable: true}}),
context.getUrlFor({command: 'display', options: {page: "slap_person_view", editable: true}}), context.getUrlFor({command: 'display', options: {page: "slap_person_view", editable: true}}),
context.getUrlFor({command: 'display', options: {page: "slapos", editable: true}}),
context.getUrlFor({command: 'display', options: {page: "slap_language_view"}}) context.getUrlFor({command: 'display', options: {page: "slap_language_view"}})
]); ]);
}) })
...@@ -111,7 +112,8 @@ ...@@ -111,7 +112,8 @@
"computer_network_href": result_list[7], "computer_network_href": result_list[7],
"project_href": result_list[8], "project_href": result_list[8],
"person_href": result_list[9], "person_href": result_list[9],
"language_href": result_list[10] "dashboard_href": result_list[10],
"language_href": result_list[11]
}) })
); );
}) })
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_panel_js.xml
View file @ be11a1bd
...@@ -74,6 +74,14 @@ ...@@ -74,6 +74,14 @@
</tuple> </tuple>
</value> </value>
</item> </item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>contributor/person_module/20200810-4679F50</string>
</tuple>
</value>
</item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <value>
...@@ -233,7 +241,7 @@ ...@@ -233,7 +241,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>zope</string> </value> <value> <string>superthomas</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -247,7 +255,7 @@ ...@@ -247,7 +255,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>986.62605.47961.15752</string> </value> <value> <string>987.59252.10760.63197</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -265,7 +273,7 @@ ...@@ -265,7 +273,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1601548137.84</float> <float>1607070942.23</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
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