From 675e93b99a291e2ace141bf0c3e44daafc9a4d86 Mon Sep 17 00:00:00 2001 From: "Roman Schmerold (BNoiZe)" Date: Sun, 29 Dec 2013 16:39:47 +0100 Subject: [PATCH] Added resize plugin to flot, removed inline css Signed-off-by: Roman Schmerold (BNoiZe) --- css/jquery.jqplot.min.css | 1 - js/plugins/flot.resize.min.js | 1 + templates/Froxlor/header.tpl | 1 + templates/Sparkle/admin/admins/admins.tpl | 77 ++++++++-------- templates/Sparkle/admin/admins/admins_add.tpl | 26 +++--- .../Sparkle/admin/admins/admins_edit.tpl | 29 +++---- .../Sparkle/admin/cronjobs/cronjob_edit.tpl | 24 ++--- .../Sparkle/admin/customers/customers.tpl | 77 ++++++++-------- .../Sparkle/admin/customers/customers_add.tpl | 28 +++--- .../admin/customers/customers_customer.tpl | 2 +- .../admin/customers/customers_edit.tpl | 30 +++---- templates/Sparkle/admin/domains/domains.tpl | 73 ++++++++-------- .../Sparkle/admin/domains/domains_add.tpl | 27 +++--- .../Sparkle/admin/domains/domains_edit.tpl | 54 ++++++------ templates/Sparkle/admin/index/index.tpl | 4 +- .../Sparkle/admin/ipsandports/ipsandports.tpl | 81 +++++++++-------- .../admin/ipsandports/ipsandports_add.tpl | 20 ++--- .../admin/ipsandports/ipsandports_edit.tpl | 22 ++--- templates/Sparkle/admin/logger/logger.tpl | 49 +++++------ .../Sparkle/admin/phpconfig/overview_add.tpl | 22 ++--- .../Sparkle/admin/phpconfig/overview_edit.tpl | 24 ++--- .../admin/phpconfig/overview_overview.tpl | 18 ++-- templates/Sparkle/admin/settings/phpinfo.tpl | 2 +- .../admin/settings/phpinfo/phpinfo_3.tpl | 2 +- .../Sparkle/admin/settings/settings_group.tpl | 2 +- .../admin/settings/settings_overview.tpl | 4 +- .../admin/settings/settings_overviewgroup.tpl | 2 +- .../Sparkle/admin/settings/updatecounters.tpl | 4 +- .../settings/updatecounters_row_admin.tpl | 80 +++++------------ .../settings/updatecounters_row_customer.tpl | 60 ++++--------- .../admin/templates/filetemplates_add.tpl | 22 ++--- .../admin/templates/filetemplates_edit.tpl | 22 ++--- .../admin/templates/templates_add_2.tpl | 21 ++--- .../admin/templates/templates_edit.tpl | 24 ++--- .../Sparkle/admin/tickets/categories.tpl | 69 +++++++-------- templates/Sparkle/admin/tickets/tickets.tpl | 73 ++++++++-------- .../admin/tickets/tickets_editcategory.tpl | 22 ++--- .../Sparkle/admin/tickets/tickets_new.tpl | 20 ++--- .../admin/tickets/tickets_newcategory.tpl | 20 ++--- .../Sparkle/admin/tickets/tickets_reply.tpl | 22 ++--- .../Sparkle/admin/traffic/index_table_row.tpl | 24 ++--- templates/Sparkle/assets/css/main.css | 46 +++++++++- .../customer/domains/domain_ssleditor.tpl | 32 +++---- .../Sparkle/customer/domains/domainlist.tpl | 56 ++++++------ .../Sparkle/customer/domains/domains_add.tpl | 24 ++--- .../Sparkle/customer/domains/domains_edit.tpl | 26 +++--- .../Sparkle/customer/email/account_add.tpl | 23 ++--- .../customer/email/account_changepw.tpl | 22 ++--- .../customer/email/account_changequota.tpl | 22 ++--- templates/Sparkle/customer/email/emails.tpl | 65 +++++++------- .../Sparkle/customer/email/emails_add.tpl | 20 ++--- .../Sparkle/customer/email/emails_email.tpl | 4 +- .../Sparkle/customer/email/forwarder_add.tpl | 22 ++--- .../Sparkle/customer/extras/htaccess.tpl | 67 +++++++------- .../Sparkle/customer/extras/htaccess_add.tpl | 20 ++--- .../Sparkle/customer/extras/htaccess_edit.tpl | 22 ++--- .../customer/extras/htaccess_htaccess.tpl | 4 +- .../Sparkle/customer/extras/htpasswds.tpl | 58 ++++++------- .../Sparkle/customer/extras/htpasswds_add.tpl | 20 ++--- .../customer/extras/htpasswds_edit.tpl | 22 ++--- .../customer/extras/htpasswds_htpasswd.tpl | 4 +- templates/Sparkle/customer/ftp/accounts.tpl | 56 ++++++------ .../Sparkle/customer/ftp/accounts_account.tpl | 4 +- .../Sparkle/customer/ftp/accounts_add.tpl | 20 ++--- .../Sparkle/customer/ftp/accounts_edit.tpl | 22 ++--- templates/Sparkle/customer/index/index.tpl | 2 +- templates/Sparkle/customer/mysql/mysqls.tpl | 60 +++++++------ .../Sparkle/customer/mysql/mysqls_add.tpl | 20 ++--- .../customer/mysql/mysqls_database.tpl | 4 +- .../Sparkle/customer/mysql/mysqls_edit.tpl | 22 ++--- .../Sparkle/customer/tickets/tickets.tpl | 87 +++++++++---------- .../Sparkle/customer/tickets/tickets_new.tpl | 20 ++--- .../customer/tickets/tickets_reply.tpl | 31 +++---- .../Sparkle/customer/traffic/traffic.tpl | 10 +-- .../customer/traffic/traffic_details.tpl | 2 +- templates/Sparkle/footer.tpl | 2 +- templates/Sparkle/header.tpl | 3 +- templates/Sparkle/index.tpl | 2 +- templates/Sparkle/misc/dberrornice.tpl | 8 +- templates/Sparkle/misc/form/table_end.tpl | 2 +- templates/Sparkle/misc/form/table_row.tpl | 6 +- templates/Sparkle/misc/form/table_section.tpl | 2 +- templates/Sparkle/misc/phperrornice.tpl | 4 +- templates/Sparkle/misc/question_yesno.tpl | 2 +- .../Sparkle/misc/question_yesno_checkbox.tpl | 2 +- .../Sparkle/webftp/webftp_main_additional.tpl | 16 ++-- 86 files changed, 945 insertions(+), 1228 deletions(-) delete mode 100644 css/jquery.jqplot.min.css create mode 100644 js/plugins/flot.resize.min.js diff --git a/css/jquery.jqplot.min.css b/css/jquery.jqplot.min.css deleted file mode 100644 index 0f84835b..00000000 --- a/css/jquery.jqplot.min.css +++ /dev/null @@ -1 +0,0 @@ -.jqplot-target{position:relative;color:#666;font-family:"Trebuchet MS",Arial,Helvetica,sans-serif;font-size:1em}.jqplot-axis{font-size:.75em}.jqplot-xaxis{margin-top:10px}.jqplot-x2axis{margin-bottom:10px}.jqplot-yaxis{margin-right:10px}.jqplot-y2axis,.jqplot-y3axis,.jqplot-y4axis,.jqplot-y5axis,.jqplot-y6axis,.jqplot-y7axis,.jqplot-y8axis,.jqplot-y9axis,.jqplot-yMidAxis{margin-left:10px;margin-right:10px}.jqplot-axis-tick,.jqplot-xaxis-tick,.jqplot-yaxis-tick,.jqplot-x2axis-tick,.jqplot-y2axis-tick,.jqplot-y3axis-tick,.jqplot-y4axis-tick,.jqplot-y5axis-tick,.jqplot-y6axis-tick,.jqplot-y7axis-tick,.jqplot-y8axis-tick,.jqplot-y9axis-tick,.jqplot-yMidAxis-tick{position:absolute;white-space:pre}.jqplot-xaxis-tick{top:0;left:15px;vertical-align:top}.jqplot-x2axis-tick{bottom:0;left:15px;vertical-align:bottom}.jqplot-yaxis-tick{right:0;top:15px;text-align:right}.jqplot-yaxis-tick.jqplot-breakTick{right:-20px;margin-right:0;padding:1px 5px 1px 5px;z-index:2;font-size:1.5em}.jqplot-y2axis-tick,.jqplot-y3axis-tick,.jqplot-y4axis-tick,.jqplot-y5axis-tick,.jqplot-y6axis-tick,.jqplot-y7axis-tick,.jqplot-y8axis-tick,.jqplot-y9axis-tick{left:0;top:15px;text-align:left}.jqplot-yMidAxis-tick{text-align:center;white-space:nowrap}.jqplot-xaxis-label{margin-top:10px;font-size:11pt;position:absolute}.jqplot-x2axis-label{margin-bottom:10px;font-size:11pt;position:absolute}.jqplot-yaxis-label{margin-right:10px;font-size:11pt;position:absolute}.jqplot-yMidAxis-label{font-size:11pt;position:absolute}.jqplot-y2axis-label,.jqplot-y3axis-label,.jqplot-y4axis-label,.jqplot-y5axis-label,.jqplot-y6axis-label,.jqplot-y7axis-label,.jqplot-y8axis-label,.jqplot-y9axis-label{font-size:11pt;margin-left:10px;position:absolute}.jqplot-meterGauge-tick{font-size:.75em;color:#999}.jqplot-meterGauge-label{font-size:1em;color:#999}table.jqplot-table-legend{margin-top:12px;margin-bottom:12px;margin-left:12px;margin-right:12px}table.jqplot-table-legend,table.jqplot-cursor-legend{background-color:rgba(255,255,255,0.6);border:1px solid #ccc;position:absolute;font-size:.75em}td.jqplot-table-legend{vertical-align:middle}td.jqplot-seriesToggle:hover,td.jqplot-seriesToggle:active{cursor:pointer}.jqplot-table-legend .jqplot-series-hidden{text-decoration:line-through}div.jqplot-table-legend-swatch-outline{border:1px solid #ccc;padding:1px}div.jqplot-table-legend-swatch{width:0;height:0;border-top-width:5px;border-bottom-width:5px;border-left-width:6px;border-right-width:6px;border-top-style:solid;border-bottom-style:solid;border-left-style:solid;border-right-style:solid}.jqplot-title{top:0;left:0;padding-bottom:.5em;font-size:1.2em}table.jqplot-cursor-tooltip{border:1px solid #ccc;font-size:.75em}.jqplot-cursor-tooltip{border:1px solid #ccc;font-size:.75em;white-space:nowrap;background:rgba(208,208,208,0.5);padding:1px}.jqplot-highlighter-tooltip,.jqplot-canvasOverlay-tooltip{border:1px solid #ccc;font-size:.75em;white-space:nowrap;background:rgba(208,208,208,0.5);padding:1px}.jqplot-point-label{font-size:.75em;z-index:2}td.jqplot-cursor-legend-swatch{vertical-align:middle;text-align:center}div.jqplot-cursor-legend-swatch{width:1.2em;height:.7em}.jqplot-error{text-align:center}.jqplot-error-message{position:relative;top:46%;display:inline-block}div.jqplot-bubble-label{font-size:.8em;padding-left:2px;padding-right:2px;color:rgb(20%,20%,20%)}div.jqplot-bubble-label.jqplot-bubble-label-highlight{background:rgba(90%,90%,90%,0.7)}div.jqplot-noData-container{text-align:center;background-color:rgba(96%,96%,96%,0.3)} \ No newline at end of file diff --git a/js/plugins/flot.resize.min.js b/js/plugins/flot.resize.min.js new file mode 100644 index 00000000..29838425 --- /dev/null +++ b/js/plugins/flot.resize.min.js @@ -0,0 +1 @@ +(function($,t,n){function p(){for(var n=r.length-1;n>=0;n--){var o=$(r[n]);if(o[0]==t||o.is(":visible")){var h=o.width(),d=o.height(),v=o.data(a);!v||h===v.w&&d===v.h?i[f]=i[l]:(i[f]=i[c],o.trigger(u,[v.w=h,v.h=d]))}else v=o.data(a),v.w=0,v.h=0}s!==null&&(s=t.requestAnimationFrame(p))}var r=[],i=$.resize=$.extend($.resize,{}),s,o="setTimeout",u="resize",a=u+"-special-event",f="delay",l="pendingDelay",c="activeDelay",h="throttleWindow";i[l]=250,i[c]=20,i[f]=i[l],i[h]=!0,$.event.special[u]={setup:function(){if(!i[h]&&this[o])return!1;var t=$(this);r.push(this),t.data(a,{w:t.width(),h:t.height()}),r.length===1&&(s=n,p())},teardown:function(){if(!i[h]&&this[o])return!1;var t=$(this);for(var n=r.length-1;n>=0;n--)if(r[n]==this){r.splice(n,1);break}t.removeData(a),r.length||(cancelAnimationFrame(s),s=null)},add:function(t){function s(t,i,s){var o=$(this),u=o.data(a);u.w=i!==n?i:o.width(),u.h=s!==n?s:o.height(),r.apply(this,arguments)}if(!i[h]&&this[o])return!1;var r;if($.isFunction(t))return r=t,s;r=t.handler,t.handler=s}},t.requestAnimationFrame||(t.requestAnimationFrame=function(){return t.webkitRequestAnimationFrame||t.mozRequestAnimationFrame||t.oRequestAnimationFrame||t.msRequestAnimationFrame||function(e,n){return t.setTimeout(e,i[f])}}()),t.cancelAnimationFrame||(t.cancelAnimationFrame=function(){return t.webkitCancelRequestAnimationFrame||t.mozCancelRequestAnimationFrame||t.oCancelRequestAnimationFrame||t.msCancelRequestAnimationFrame||clearTimeout}())})(jQuery,this);(function($){var options={};function init(plot){function onResize(){var placeholder=plot.getPlaceholder();if(placeholder.width()==0||placeholder.height()==0)return;plot.resize();plot.setupGrid();plot.draw()}function bindEvents(plot,eventHolder){plot.getPlaceholder().resize(onResize)}function shutdown(plot,eventHolder){plot.getPlaceholder().unbind("resize",onResize)}plot.hooks.bindEvents.push(bindEvents);plot.hooks.shutdown.push(shutdown)}$.plot.plugins.push({init:init,options:options,name:"resize",version:"1.0"})})(jQuery); \ No newline at end of file diff --git a/templates/Froxlor/header.tpl b/templates/Froxlor/header.tpl index 1d724b14..bfb21ec5 100644 --- a/templates/Froxlor/header.tpl +++ b/templates/Froxlor/header.tpl @@ -13,6 +13,7 @@ + diff --git a/templates/Sparkle/admin/admins/admins.tpl b/templates/Sparkle/admin/admins/admins.tpl index d4e98ae2..093aacc1 100644 --- a/templates/Sparkle/admin/admins/admins.tpl +++ b/templates/Sparkle/admin/admins/admins.tpl @@ -10,58 +10,51 @@ $header
- -
- {$searchcode} -
- -
- - {$lng['admin']['admin_add']} -
- - - - - - - - - - - - - - - - - - - - $admins - -
- {$lng['customer']['name']} {$arrowcode['name']} - - {$lng['login']['username']} {$arrowcode['loginname']} - {$lng['admin']['customers']} {$lng['panel']['options']}
{$pagingcode}
- -

-

+ +
+ {$searchcode} +
-
- -
{$lng['admin']['admin_add']}
+ + + + + + + + + + + + + + + + + + + + + + $admins + +
{$lng['customer']['name']} {$arrowcode['name']}{$lng['login']['username']} {$arrowcode['loginname']}{$lng['admin']['customers']} {$lng['panel']['options']}
{$pagingcode}
+ + + +
+ + {$lng['admin']['admin_add']} +
$footer - diff --git a/templates/Sparkle/admin/admins/admins_add.tpl b/templates/Sparkle/admin/admins/admins_add.tpl index d5246d74..c9ffbe6c 100644 --- a/templates/Sparkle/admin/admins/admins_add.tpl +++ b/templates/Sparkle/admin/admins/admins_add.tpl @@ -10,20 +10,14 @@ $header
-
- Froxlor - {$title} + + + + - - {$admin_add_form} -
- -

- - - - -

-
+ + {$admin_add_form} +
@@ -32,9 +26,9 @@ $header
-

- *: {$lng['admin']['valuemandatory']}
- **: {$lng['admin']['valuemandatorycompany']} +

+ *: {$lng['admin']['valuemandatory']}
+ **: {$lng['admin']['valuemandatorycompany']}

diff --git a/templates/Sparkle/admin/admins/admins_edit.tpl b/templates/Sparkle/admin/admins/admins_edit.tpl index 651f1daf..107c7269 100644 --- a/templates/Sparkle/admin/admins/admins_edit.tpl +++ b/templates/Sparkle/admin/admins/admins_edit.tpl @@ -2,8 +2,7 @@ $header

- {$title}  - {$title} + {$title} {$title}

@@ -16,21 +15,15 @@ $header
-
- Froxlor - {$title} + + + + + - - {$admin_edit_form} -
- -

- - - - - -

-
+ + {$admin_edit_form} +
@@ -39,8 +32,8 @@ $header
-

- *: {$lng['admin']['valuemandatory']} +

+ *: {$lng['admin']['valuemandatory']}

diff --git a/templates/Sparkle/admin/cronjobs/cronjob_edit.tpl b/templates/Sparkle/admin/cronjobs/cronjob_edit.tpl index 5ee7f040..d3f7d57b 100644 --- a/templates/Sparkle/admin/cronjobs/cronjob_edit.tpl +++ b/templates/Sparkle/admin/cronjobs/cronjob_edit.tpl @@ -10,21 +10,15 @@ $header
-
- Froxlor - {$title} - - - {$cronjobs_edit_form} -
- -

- - - - - -

-
+ + + + + + + + {$cronjobs_edit_form} +
diff --git a/templates/Sparkle/admin/customers/customers.tpl b/templates/Sparkle/admin/customers/customers.tpl index 2cfefe94..5024550e 100644 --- a/templates/Sparkle/admin/customers/customers.tpl +++ b/templates/Sparkle/admin/customers/customers.tpl @@ -10,54 +10,51 @@ $header
- -
- {$searchcode} -
+ + + +
+ {$searchcode} +
- +
  {$lng['admin']['customer_add']}
- + - - - - - - - - - - - +
- {$lng['customer']['name']}, - {$lng['customer']['firstname']} {$arrowcode['c.name']} - - {$lng['login']['username']} {$arrowcode['c.loginname']} - - {$lng['admin']['admin']} {$arrowcode['a.loginname']} - {$lng['admin']['lastlogin_succ']}{$lng['panel']['options']}
+ + + + + + + + + + - - $customers - + + $customers + - - - - - - - -
+ {$lng['customer']['name']}, + {$lng['customer']['firstname']} {$arrowcode['c.name']} + + {$lng['login']['username']} {$arrowcode['c.loginname']} + + {$lng['admin']['admin']} {$arrowcode['a.loginname']} + {$lng['admin']['lastlogin_succ']}{$lng['panel']['options']}
{$pagingcode}
- -

- - -

+ + + + {$pagingcode} + + + +
diff --git a/templates/Sparkle/admin/customers/customers_add.tpl b/templates/Sparkle/admin/customers/customers_add.tpl index 1e19c3ab..3ec91276 100644 --- a/templates/Sparkle/admin/customers/customers_add.tpl +++ b/templates/Sparkle/admin/customers/customers_add.tpl @@ -10,20 +10,14 @@ $header
-
- Froxlor - {$title} - - - {$customer_add_form} -
- -

- - - - -

-
+ + + + + + + {$customer_add_form} +
@@ -32,9 +26,9 @@ $header
-

- *: {$lng['admin']['valuemandatory']}
- **: {$lng['admin']['valuemandatorycompany']} +

+ *: {$lng['admin']['valuemandatory']}
+ **: {$lng['admin']['valuemandatorycompany']}

diff --git a/templates/Sparkle/admin/customers/customers_customer.tpl b/templates/Sparkle/admin/customers/customers_customer.tpl index 1c5016a1..b99a454f 100644 --- a/templates/Sparkle/admin/customers/customers_customer.tpl +++ b/templates/Sparkle/admin/customers/customers_customer.tpl @@ -60,7 +60,7 @@ - + {$lng['panel']['edit']}   diff --git a/templates/Sparkle/admin/customers/customers_edit.tpl b/templates/Sparkle/admin/customers/customers_edit.tpl index dff0fe8a..b627ea9a 100644 --- a/templates/Sparkle/admin/customers/customers_edit.tpl +++ b/templates/Sparkle/admin/customers/customers_edit.tpl @@ -10,21 +10,15 @@ $header
-
- Froxlor - {$title} - - - {$customer_edit_form} -
- -

- - - - - -

-
+ + + + + + + + {$customer_edit_form} +
@@ -33,9 +27,9 @@ $header
-

- *: {$lng['admin']['valuemandatory']}
- **: {$lng['admin']['valuemandatorycompany']} +

+ *: {$lng['admin']['valuemandatory']}
+ **: {$lng['admin']['valuemandatorycompany']}

diff --git a/templates/Sparkle/admin/domains/domains.tpl b/templates/Sparkle/admin/domains/domains.tpl index e853c5fe..b4e7f48c 100644 --- a/templates/Sparkle/admin/domains/domains.tpl +++ b/templates/Sparkle/admin/domains/domains.tpl @@ -10,62 +10,59 @@
+ + -
- {$searchcode} -
- - +
+ {$searchcode} +
+ +
  {$lng['admin']['domain_add']}
- - - - - - - - - - - - - - {$domains} - - - + + +
{$lng['domains']['domainname']} {$arrowcode['d.domain']}{$lng['admin']['ipsandports']['ip']}{$lng['admin']['customer']} {$arrowcode['c.loginname']}{$lng['panel']['options']}
+ + + + + + + + + + + {$domains} + + + - -
{$lng['domains']['domainname']} {$arrowcode['d.domain']}{$lng['admin']['ipsandports']['ip']}{$lng['admin']['customer']} {$arrowcode['c.loginname']}{$lng['panel']['options']}
{$pagingcode}
- -

- - -

+ +
-
-
{$lng['admin']['warning']}
-
- {$lng['admin']['domain_nocustomeraddingavailable']} -
+
+
{$lng['admin']['warning']}
+
+ {$lng['admin']['domain_nocustomeraddingavailable']}
+
-
-   - {$lng['admin']['domain_add']} -
+
+   + {$lng['admin']['domain_add']} +
diff --git a/templates/Sparkle/admin/domains/domains_add.tpl b/templates/Sparkle/admin/domains/domains_add.tpl index fe4c57bd..60f59f57 100644 --- a/templates/Sparkle/admin/domains/domains_add.tpl +++ b/templates/Sparkle/admin/domains/domains_add.tpl @@ -10,23 +10,22 @@ $header
-
- Froxlor - {$title} + + + + - - {$domain_add_form} -
- -

- - - - -

-
+ + {$domain_add_form} +
- +
+
+

+ *: {$lng['admin']['valuemandatory']} +

+
$footer diff --git a/templates/Sparkle/admin/domains/domains_edit.tpl b/templates/Sparkle/admin/domains/domains_edit.tpl index addb79ee..6dfe6f38 100644 --- a/templates/Sparkle/admin/domains/domains_edit.tpl +++ b/templates/Sparkle/admin/domains/domains_edit.tpl @@ -10,38 +10,34 @@ $header
-
- Froxlor - {$title} - -
-
{$lng['admin']['delete_statistics']}
-

{$speciallogwarning}

-

-
-   - -
+ + + + + + + + +
+
{$lng['admin']['delete_statistics']}
+

{$speciallogwarning}

+

+
+   +
+
- - - - {$domain_edit_form} -
- -

- - - - - - - -

-
+ + {$domain_edit_form} +
-
- +
+
+

+ *: {$lng['admin']['valuemandatory']} +

+
$footer diff --git a/templates/Sparkle/admin/index/index.tpl b/templates/Sparkle/admin/index/index.tpl index f4d24f42..814e9708 100644 --- a/templates/Sparkle/admin/index/index.tpl +++ b/templates/Sparkle/admin/index/index.tpl @@ -167,7 +167,7 @@ $header -