maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
2,135 Commits 6 Branches 188 Tags
019da862dd46b18c5083f66ca8fdfb52519ddea0
Commit Graph

155 Commits

Author SHA1 Message Date
Roman Schmerold (BNoiZe)
7101655ed7 Cleaning up unnessesary js code, removing inline js 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-07 13:39:29 +01:00
Roman Schmerold (BNoiZe)
7fc3ac587a Redirect to last URL after relogin when session timed out, fixes #443 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-05 22:35:26 +01:00
Roman Schmerold (BNoiZe)
fdc29ee8c2 Adding icon for touch devices 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-05 19:52:24 +01:00
Roman Schmerold (BNoiZe)
ba9d185eb4 Improving favicon 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-05 19:33:27 +01:00
Roman Schmerold (BNoiZe)
ec69af7938 Added a reset button to searchfields, improved js code 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-05 19:16:56 +01:00
Roman Schmerold (BNoiZe)
39b1980509 Only use header css if webfont is enabled, fixes navigation padding 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-05 18:41:48 +01:00
Roman Schmerold (BNoiZe)
d6d40c8e12 Fixed wrong path to IE stylesheet 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-05 18:18:21 +01:00
Roman Schmerold (BNoiZe)
c288d31762 Fixed usage of wrong fallback fonts if webfonts are enabled 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-05 17:18:33 +01:00
Roman Schmerold (BNoiZe)
11adf4b196 Fixed webfonts not used if enabled 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-05 17:12:44 +01:00
Johannes Matheis
f320daa93c make color of input fields consistent to body color 2014-01-04 16:24:02 +00:00
Johannes Matheis
2bbfd47ac2 set some more fg colors to obtain readability 2014-01-03 17:14:06 +00:00
Roman Schmerold (BNoiZe)
0c2aa8de45 Add description field to FTP accounts, fixes #1340 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-02 22:45:30 +01:00
Florian Aders (EleRas)
93d60e4305 Only show description for theme variants, not base-theme - name 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-31 10:15:31 +01:00
Florian Aders (EleRas)
e98792a6af froxlor.css: move menuitems closer together 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-30 19:27:50 +01:00
Florian Aders (EleRas)
7f1b696edd Removed double tinyform in change language/password/theme 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-30 19:25:46 +01:00
Florian Aders (EleRas)
25649c2aa9 froxlor.css: fixed formatting of formfields 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-30 18:34:12 +01:00
Florian Aders (EleRas)
a2f7025940 froxlor.css: fixed corners of add/edit forms 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-30 18:30:02 +01:00
Florian Aders (EleRas)
3e5e4790bf froxlor.css: fixed dashboard - corners 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-30 18:25:14 +01:00
Florian Aders (EleRas)
41263ab031 froxlor.css: display menu and content on the same height 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-30 18:17:55 +01:00
Florian Aders (EleRas)
e006a69535 Removed a lot of stuff from froxlor.css, load sparkle and modify needed elements for easier maintainabiity 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-30 18:00:02 +01:00
Florian Aders (EleRas)
41b7724d7e Fixed edge-bug in table for froxlor.css 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-30 17:22:22 +01:00
Florian Aders (EleRas)
ffac6e38dc Move the froxlor - theme further to css, nearly done 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-30 17:06:36 +01:00
Florian Aders (EleRas)
813c76d55b Added Froxlor - theme based on sparkle in css 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-29 19:26:10 +01:00
Florian Aders (EleRas)
b4a345d182 Allow themes to have various variants 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2013-12-29 17:35:03 +01:00
Roman Schmerold (BNoiZe)
675e93b99a Added resize plugin to flot, removed inline css 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-29 16:39:47 +01:00
Roman Schmerold (BNoiZe)
f3b61ce87c Removed unused plugins, added axis labels 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-27 15:00:38 +01:00
Roman Schmerold (BNoiZe)
5cb0256a58 Improvements to traffic graphs 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-27 14:13:38 +01:00
Roman Schmerold (BNoiZe)
166d75454e Minor interface tweaks, removed unused css 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-24 23:06:29 +01:00
Roman Schmerold (BNoiZe)
429f748ad8 Fixing mailtraffic cron, fixes traffic graph sorting 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-22 10:57:56 +01:00
Roman Schmerold (BNoiZe)
82f3d8d18c Fixes various traffic graph issues 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-20 23:56:48 +01:00
Roman Schmerold (BNoiZe)
308cc0cfb9 Fixed a bug which prevented mailtraffic from being shown 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-20 23:36:09 +01:00
Roman Schmerold (BNoiZe)
a92cdb2926 Added cron for mailtraffic (with EleRas), fixes #69 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-20 23:12:47 +01:00
Roman Schmerold (BNoiZe)
7969edf1b4 Added title-tags to buttons, fixes 1328 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-20 19:14:24 +01:00
Michael Kaufmann (d00p)
ec59d3a8e8 Merge branch 'master' of github.com:Froxlor/Froxlor 2013-12-19 07:55:48 +01:00
Roman Schmerold (BNoiZe)
c7d00d4d11 Switched traffic charts from jqPlot to flot 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-18 18:30:57 +01:00
Michael Kaufmann (d00p)
7267c2dec9 Merge remote-tracking branch 'origin/0.9.31' 2013-12-18 09:58:38 +01:00
Michael Kaufmann (d00p)
7a5be5456d categorize cronjob on cronjob-overview 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-17 09:59:11 +01:00
Roman Schmerold (BNoiZe)
dc886c9fc5 added tooltips to webspace/traffic bars 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-16 11:47:25 +01:00
Michael Kaufmann (d00p)
6ed02e593c display phperror below fixed header in sparkle theme; fix wrong parameter-list and ignorance of in makePathfield 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-16 11:32:25 +01:00
Michael Kaufmann (d00p)
37a242a679 migrate webftp stuff to new settings-class, refs #1325 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-16 11:03:09 +01:00
Michael Kaufmann (d00p)
164b40fef3 fix wrong language-string in settings/180.dkim.php, implemented Settings::Add() for updates later (much better than a manual query etc.), added new php-errorhandler so we can display php errors/warnings/notices (whatever is activated) in a nicer way 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-16 10:43:38 +01:00
Roman Schmerold (BNoiZe)
cd3554eecf migrated the themes to use the nice Settings-class 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-16 10:25:25 +01:00
Michael Kaufmann (d00p)
14311eb8b0 Merge remote-tracking branch 'origin/0.9.31' 2013-12-15 19:45:27 +01:00
Roman Schmerold (BNoiZe)
fd0a2bea2f tweaking the traffic-graphs 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-15 14:21:23 +01:00
Michael Kaufmann (d00p)
4667ccbe43 Merge remote-tracking branch 'origin/0.9.31' 2013-12-15 11:40:22 +01:00
Michael Kaufmann (d00p)
b8f963cd29 fix pagination and sorting in customer-tickets, refs #701 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-15 10:48:54 +01:00
Michael Kaufmann (d00p)
b18afacedb Merge remote-tracking branch 'origin/0.9.31' 2013-12-15 08:41:29 +01:00
Roman Schmerold (BNoiZe)
40dbf85f77 added a.active class to the template css 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2013-12-14 18:07:15 +01:00
Michael Kaufmann (d00p)
eb7d7d7316 Merge remote-tracking branch 'origin/0.9.31' 2013-12-14 15:44:34 +01:00
Michael Kaufmann (d00p)
7688f83134 beautify loadConfigArrayDir(); fix pagination and sorting in admin-tickets, fixes #701 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2013-12-14 15:43:51 +01:00