maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
3,468 Commits 6 Branches 188 Tags
f38a0fd8b656aa942bd387b11ae580d6aa09bad6
Commit Graph

281 Commits

Author SHA1 Message Date
Michael Kaufmann (d00p)
e7f54503c1 fix template-variable for 'forgot password', thx to Nepstar for noticing 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-11-17 10:47:24 +01:00
junkpad92
329197902e Fix Safari checkbox-bug 
If checkbox is focused (clicking in the checkbox) checkbox shifts downward. I think: Only in Safari on Yosemite. Other browsers not affected.
 2014-11-03 18:56:23 +01:00
Michael Kaufmann (d00p)
3fe10d8d3d merge pull request #193 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
 2014-06-02 09:15:45 +02:00
Roman Schmerold (BNoiZe)
9b0cc70542 Fix height of #maincontent if newsfeed is shown 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-06-01 22:02:48 +02:00
Roman Schmerold (BNoiZe)
38599ec4b9 Read the custom RSS directly from the settings 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-06-01 21:55:10 +02:00
Roman Schmerold (BNoiZe)
7d4ea57381 Removing obsolete 'language' attribute from script-tags 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-06-01 19:12:14 +02:00
Roman Schmerold (BNoiZe)
538b99055c Removing unwanted files which should be ignored by git anyway 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-06-01 18:50:55 +02:00
Roman Schmerold (BNoiZe)
3acfcd4a95 Adding a custom newsfeed to the customer-dashboard, fixes #1408 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-06-01 18:46:15 +02:00
Robert Förster (Dessa)
73acfb5d7c update js folder 
- add images from jquery-ui to css folder, the stylesheet expects them being around even though we don't use them, adding them and not using them is better then editing the stylesheet and then forgetting about it again after every jquery-ui update, i suppose..
- fix html5shiv name, it was minified to begin with
- bump flot to 0.8.3, fix plugin name (no functional changes for us)
- bump tablesorter to 2.16.4 (likewise)
 2014-05-20 19:50:57 +02:00
Roman Schmerold (BNoiZe)
c15fb4043b Removed unneeded height setting on checkboxes 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-05-07 13:59:53 +02:00
Roman Schmerold (BNoiZe)
8b7dc057e1 Removed linebreak after checkboxes, fixes #1397 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-03-19 13:16:16 +01:00
Roman Schmerold (BNoiZe)
d10a2764af Improving display of new ticket icon 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-03-01 16:21:13 +01:00
Roman Schmerold (BNoiZe)
125b648af7 Made the headers in froxlor theme a little more pleasent to view 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-02-12 10:01:52 +01:00
Roman Schmerold (BNoiZe)
97154d2065 Fixed dashboard table header in Froxlor theme 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-02-12 09:50:39 +01:00
Florian Aders (EleRas)
b4b80dd0cf Add integritycheck for ssl_redirect where parentdomains have no SSL (leftovers from a bug recently fixed by d00p) 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2014-02-11 19:17:25 +01:00
Florian Aders (EleRas)
e3e4dba90d Added manuel integritycheck for admins 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
 2014-02-11 16:40:53 +01:00
Roman Schmerold (BNoiZe)
b5a3567238 D'oh, forgot to redo the customer dashboard 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-02-08 17:47:43 +01:00
Roman Schmerold (BNoiZe)
dff26e68b9 Improving the dashboard styling, fixed missing border-radius 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-02-08 17:41:10 +01:00
Roman Schmerold (BNoiZe)
0aeadb37af Fixed missing linebreak on lists of ip addresses 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-02-07 17:21:47 +01:00
Roman Schmerold (BNoiZe)
3f7819f6bb Optimized the Dashboard CSS/HTML 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-02-06 07:33:57 +01:00
Roman Schmerold (BNoiZe)
b050e3dcd4 Fixing display of mailquota in dashboard, fixes #1369 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-28 21:13:18 +01:00
Roman Schmerold (BNoiZe)
9dd63fd1e1 Fixed a missing icon 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-27 23:28:57 +01:00
Roman Schmerold (BNoiZe)
c69a05efa5 Redesigned tables to use less CSS 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-27 19:57:03 +01:00
Roman Schmerold (BNoiZe)
5991c5de30 Finally really fixing dropdowns 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-24 18:34:51 +01:00
Roman Schmerold (BNoiZe)
c107652e9a fixing tables and dropdowns in froxlor theme 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-24 17:48:30 +01:00
Roman Schmerold (BNoiZe)
397c6e9c50 Various design fixes 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
 2014-01-24 15:14:57 +01:00
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