Bernd Wurst commited on 2014-12-17 09:24:32
Zeige 6 geänderte Dateien mit 57 Einfügungen und 12 Löschungen.
... | ... |
@@ -17,6 +17,8 @@ Nevertheless, in case you use a significant part of this code, we ask (but not r |
17 | 17 |
require_once('inc/base.php'); |
18 | 18 |
require_once('inc/security.php'); |
19 | 19 |
require_role(ROLE_SYSTEMUSER); |
20 |
+require_once('inc/jquery.php'); |
|
21 |
+javascript('domains.js'); |
|
20 | 22 |
|
21 | 23 |
require_once('vmail.php'); |
22 | 24 |
|
... | ... |
@@ -42,20 +44,39 @@ beachtet. Subdomains können grundsätzlich nur durch Administratoren eingericht |
42 | 44 |
<tr><th>Domainname</th><th>Einstellung</th><th></th><th></th></tr> |
43 | 45 |
'); |
44 | 46 |
|
47 |
+$odd = true; |
|
45 | 48 |
foreach ($domains AS $id => $dom) { |
46 |
- $trextra = ''; |
|
49 |
+ $odd = !$odd; |
|
50 |
+ $trextra = ($odd ? ' class="odd"' : ' class="even"'); |
|
47 | 51 |
$extra = ''; |
52 |
+ $edit_disabled = false; |
|
48 | 53 |
$type = maildomain_type($dom['type']); |
49 | 54 |
$edit = html_form('vmail_domainchange', 'domainchange', '', html_select('type', array('virtual' => 'Webinterface-Verwaltung', 'auto' => '.courier-Dateien', 'none' => 'keine E-Mails empfangen'), $dom['type']).' <input type="hidden" name="id" value="'.$id.'" /><input type="submit" value="ändern" />'); |
50 |
- if ($dom['type'] == 'manual') |
|
55 |
+ if ($dom['type'] == 'manual') { |
|
56 |
+ $edit_disabled = true; |
|
51 | 57 |
$edit = 'Kann nur von Admins geändert werden'; |
52 |
- if (domain_has_vmail_accounts($id)) |
|
58 |
+ } |
|
59 |
+ if (domain_has_vmail_accounts($id)) { |
|
60 |
+ $edit_disabled = true; |
|
53 | 61 |
$edit = 'Keine Änderung möglich, so lange noch '.internal_link("vmail", "E-Mail-Konten").' für diese Domain eingerichtet sind.'; |
62 |
+ } |
|
54 | 63 |
if ($dom['mailserver_lock']) { |
55 |
- $trextra = ' style="background-color: #faa;"'; |
|
64 |
+ $trextra .= ' style="background-color: #faa;"'; |
|
56 | 65 |
$extra = '<strong>Mailserver-Sperre aktiv!</strong>'; |
57 | 66 |
} |
58 |
- output("<tr{$trextra}><td>{$dom['name']}</td><td>{$type}</td><td>{$edit}</td><td style=\"border: none;\">{$extra}</td></tr>\n"); |
|
67 |
+ $check_off = ($dom['type'] == 'none' ? ' checked="checked"' : ''); |
|
68 |
+ $check_webinterface = ($dom['type'] == 'virtual' ? ' checked="checked"' : ''); |
|
69 |
+ $check_manual = ($dom['type'] == 'auto' || $dom['type'] == 'manual' ? ' checked="checked"' : ''); |
|
70 |
+ |
|
71 |
+ $buttons = '<span class="buttonset'.($edit_disabled ? ' disabled':'').'" id="buttonset-'.$id.'"> |
|
72 |
+ <input type="radio" name="option-'.$id.'" id="option-'.$id.'-off" value="off"'.$check_off.' '.($edit_disabled ? ' disabled="disabled"':'').'/> |
|
73 |
+ <label for="option-'.$id.'-off">Ausgeschaltet</label> |
|
74 |
+ <input type="radio" name="option-'.$id.'" id="option-'.$id.'-webinterface" value="webinterface"'.$check_webinterface.' '.($edit_disabled ? ' disabled="disabled"':'').'/> |
|
75 |
+ <label for="option-'.$id.'-webinterface">Webinterface</label> |
|
76 |
+ <input type="radio" name="option-'.$id.'" id="option-'.$id.'-manual" value="manual"'.$check_manual.' '.($edit_disabled ? ' disabled="disabled"':'').'/> |
|
77 |
+ <label for="option-'.$id.'-manual">Manuell</label> |
|
78 |
+ </span>'; |
|
79 |
+ output("<tr{$trextra}><td>{$dom['name']}</td><td>$buttons</td><td>{$type}</td><td>{$edit}</td><td style=\"border: none;\">{$extra}</td></tr>\n"); |
|
59 | 80 |
if (array_key_exists($id, $subdomains)) { |
60 | 81 |
foreach ($subdomains[$id] AS $subdom) { |
61 | 82 |
$type = maildomain_type($subdom['type']); |
... | ... |
@@ -52,7 +52,7 @@ if ($messages) { |
52 | 52 |
} |
53 | 53 |
?> |
54 | 54 |
|
55 |
-<h3>schokokeks.org Hosting Webinterface</h3> |
|
55 |
+<h3 class="headline">schokokeks.org Hosting Webinterface</h3> |
|
56 | 56 |
<p>Auf dieser Seite können Sie diverse Einstellungen Ihres Accounts auf schokokeks.org Hosting festlegen. Sofern Sie noch kein Kunde von schokokeks.org Hosting sind, können Sie diese Seite nicht benutzen. Besuchen Sie in diesem Fall bitte unsere <a href="http://www.schokokeks.org">öffentliche Seite</a>.</p> |
57 | 57 |
<form action="" method="post"> |
58 | 58 |
<p><label for="username" class="login_label">Benutzername oder E-Mail-Adresse:</label> <input type="text" id="username" name="webinterface_username" size="30" /></p> |
... | ... |
@@ -52,7 +52,7 @@ if ($messages) { |
52 | 52 |
} |
53 | 53 |
?> |
54 | 54 |
|
55 |
-<h3>Sicherheits-Code</h3> |
|
55 |
+<h3 class="headline">Sicherheits-Code</h3> |
|
56 | 56 |
<p>Ihr Zugang ist mit Zwei-Faktor-Anmeldung geschützt. Sie müssen daher jetzt noch den aktuellsten Code Ihres TOTP-Geräts eingeben.</p> |
57 | 57 |
<form action="" method="post"> |
58 | 58 |
<p><label for="code" class="login_label">Google-Authenticator-Code:</label> <input type="text" id="code" name="webinterface_totpcode" size="20" /></p> |
... | ... |
@@ -27,9 +27,9 @@ else |
27 | 27 |
echo "<title>Administration</title>"; |
28 | 28 |
?> |
29 | 29 |
<!--<link rel="stylesheet" href="<?php echo $BASE_PATH; ?>css/default.css" type="text/css" media="screen" title="Normal" />--> |
30 |
-<link rel="stylesheet" href="<?php echo $THEME_PATH; ?>style.css" type="text/css" media="screen" title="Normal" /> |
|
31 | 30 |
<link rel="shortcut icon" href="<?php echo $THEME_PATH; ?>favicon.ico" type="image/x-icon" /> |
32 | 31 |
<?php echo $html_header; ?> |
32 |
+<link rel="stylesheet" href="<?php echo $THEME_PATH; ?>style.css" type="text/css" media="screen" title="Normal" /> |
|
33 | 33 |
</head> |
34 | 34 |
|
35 | 35 |
<body> |
... | ... |
@@ -55,7 +55,7 @@ if ($messages) { |
55 | 55 |
|
56 | 56 |
<?php |
57 | 57 |
if ($headline) { |
58 |
- echo "<h3>$headline</h3>"; |
|
58 |
+ echo "<h3 class=\"headline\">$headline</h3>"; |
|
59 | 59 |
} |
60 | 60 |
?> |
61 | 61 |
|
... | ... |
@@ -238,8 +238,8 @@ div.vmail-forward input { |
238 | 238 |
|
239 | 239 |
div.content { |
240 | 240 |
margin-left: 200px; |
241 |
- padding-left: 10px; |
|
242 |
- border-left: 1px solid #000000; |
|
241 |
+ padding-left: 40px; |
|
242 |
+ /*border-left: 1px solid #000000;*/ |
|
243 | 243 |
} |
244 | 244 |
/* overflow: hidden; */ |
245 | 245 |
|
... | ... |
@@ -283,13 +283,16 @@ div.foot { |
283 | 283 |
font-size: 90%; |
284 | 284 |
} |
285 | 285 |
|
286 |
- |
|
287 | 286 |
h3 { |
288 | 287 |
color: #425d6c; |
288 |
+ margin-top: 2em; |
|
289 | 289 |
padding-bottom: 2px; |
290 | 290 |
border-bottom: 1px solid #425d6c; |
291 | 291 |
} |
292 | 292 |
|
293 |
+h3.headline { |
|
294 |
+ margin-top: 0; |
|
295 |
+} |
|
293 | 296 |
|
294 | 297 |
ul { |
295 | 298 |
margin-bottom: 10px; |
... | ... |
@@ -314,6 +317,10 @@ td { |
314 | 317 |
padding: 0.5em; |
315 | 318 |
} |
316 | 319 |
|
320 |
+td.number { |
|
321 |
+ text-align: right; |
|
322 |
+} |
|
323 |
+ |
|
317 | 324 |
th { |
318 | 325 |
padding: 0px 1em; |
319 | 326 |
} |
... | ... |
@@ -369,3 +376,16 @@ tr.unpaid td { |
369 | 376 |
background-color: #fdd; |
370 | 377 |
} |
371 | 378 |
|
379 |
+.ui-button { |
|
380 |
+ border: 1px solid #000; |
|
381 |
+ background-color: #fff; |
|
382 |
+ color: #000; |
|
383 |
+} |
|
384 |
+ |
|
385 |
+.ui-state-active, |
|
386 |
+.ui-widget-content .ui-state-active, |
|
387 |
+.ui-widget-header .ui-state-active { |
|
388 |
+ border: 1px solid #000; |
|
389 |
+ background: #000; |
|
390 |
+ color: #fff; |
|
391 |
+} |
|
372 | 392 |