diff --git a/modules/www/webadmin/add_edit_chan.tmpl b/modules/www/webadmin/add_edit_chan.tmpl index bcef393c..5fd2bcd3 100644 --- a/modules/www/webadmin/add_edit_chan.tmpl +++ b/modules/www/webadmin/add_edit_chan.tmpl @@ -1,53 +1,58 @@
- - +
+ + + - - +

Channel Info

+
+
+ +
+
Channel Name:
+
+
If the channel has a key and you want to save the key, type: #CHAN KEY +
+ -
- - +
+
Buffer Count:
+
+
- - +
+
Default Modes:
+
+
- - - - + + + - - - - +
+

Flags

+
+
+ + checked="checked" /> + + + + + checked="checked" disabled="disabled" /> + + + +
+
+
+
- - - - - - - - - - -
Channel Info
Channel Name: - - - - -
- -
Buffer Count:
Default Modes:
Save: checked="checked" />
Options: - - checked="checked" disabled="disabled" />
- -
- - +
+ +
diff --git a/modules/www/webadmin/add_edit_user.tmpl b/modules/www/webadmin/add_edit_user.tmpl index ec7ebe98..25a7e72a 100644 --- a/modules/www/webadmin/add_edit_user.tmpl +++ b/modules/www/webadmin/add_edit_user.tmpl @@ -1,268 +1,251 @@
- - - +
+ -
- - - - - - - - - - - - - - - - - - - - - -
Authentication
- Username: - - - - - - - -
Password:
Confirm password:
Allowed IPs: -
+
Leave empty to allow connections from all IPs.
+ Otherwise, one entry per line, wildcards * and ? are available. +
+
+ + + - - +
+

IRC Information

+ + Nick, AltNick, Ident, RealName and QuitMsg can be left empty to use default values. + +
+
+
+
Nick:
+
+
+
+
AltNick:
+
+
+
+
+
Ident:
+
+
+
+
StatusPrefix:
+
+
+
+
+
RealName:
+
+
+
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
- - - - +
+
QuitMsg:
+
+
+
- - - - + +
One server per line, host [+]port[ password] + +
+ + + - - - - - -
IRC Information
Nickname:
Alt. Nickname:
Status Prefix:
Ident:
Realname:
VHost: + + -
Quit-MSG:
Servers: -
Active: checked="checked" /> -
+
+

Modules

+
+
+ + + + + + + + + -
NameArgumentsDescription
- + + + + + + + - - - - - - - - - - -
Module(s)
+ checked="checked" disabled="disabled" /> + + +
- - - - - - - - + +
NameArgumentsDescription
+ + + - -
- checked="checked" disabled="disabled" /> - - -
- - - - - - - - - - - - - - - - - - - - - - - -
Channel(s)
Default Modes:
- - - You will be able to add + modify channels here after you created the user. - - - Add a Channel - - +
+

Channels

+ + You will be able to add + modify channels here after you created the user.
+ +
+
+ + + + + + + + + + + - -
[Add]SaveNameCurModesDefModesBufferCountOptions
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
[Add]SaveNameCurModesDefModesBufferCountOptions- Add a channel (opens in same page)
- - [Edit] [Del] - checked="checked" />
- +
  <- Add a channel (opens in same page)  
+ + - - + + + + + + + + + + + + + +
ZNC Behavior
+ + [Edit] [Del] + checked="checked" />
+
+
+ +
- - - Skin: - - 1 ?> - - - No other skins found - - - +
+

Default Channel Settings

+
+
+
+
Modes:
+
+
Empty = use standard value +
+
+
Buffer Size:
+
+
Empty = use standard value +
+
+
+
- - Playback Buffer Size: - - +
+

Flags

+
+
+ + + checked="checked" disabled="disabled" /> + + + +
+
+
+
- - Timestamp Format: - - - - - Timezone offset: - - - - - Join Tries: - - - - - Max Joins: - - - - - Options: - - - checked="checked" disabled="disabled" />
 - - - - - - CTCP Replies: - - - - - + +
One reply per line. Example: TIME Buy a watch! + +
+ + + - +
+ +
diff --git a/modules/www/webadmin/index.tmpl b/modules/www/webadmin/index.tmpl index 7ffb7416..4bd2270a 100644 --- a/modules/www/webadmin/index.tmpl +++ b/modules/www/webadmin/index.tmpl @@ -1,9 +1,6 @@ -Settings -
-List Users -
-Add User +

Welcome to the ZNC webadmin module. All changes you make will be in effect immediately after + you submitted them.

diff --git a/modules/www/webadmin/listusers.tmpl b/modules/www/webadmin/listusers.tmpl index 8fece188..5c3c104c 100644 --- a/modules/www/webadmin/listusers.tmpl +++ b/modules/www/webadmin/listusers.tmpl @@ -1,11 +1,10 @@ - - There are no users defined.
- Click here, if you would like to add one. - - - + + There are no users defined. Click here if you would like to add one. + +
+ @@ -13,23 +12,25 @@ - + - - + + + - - - - + + + + - -
Action UsernameCurrent Server IRC Nick
- [Edit] - [Delete] + [Edit] + [Delete]
- + + + + diff --git a/modules/www/webadmin/settings.tmpl b/modules/www/webadmin/settings.tmpl index 33741664..458cd6c1 100644 --- a/modules/www/webadmin/settings.tmpl +++ b/modules/www/webadmin/settings.tmpl @@ -1,151 +1,125 @@ -
- - - + +
+ -
- - - - - - - - - - - - -
Listen Port(s)
- - - - - - - - - - +

Listen Port(s)

+
+
+
+
+
PortBindHostSSLIPv4IPv6
+ + + + + + + + + + + + + + + + + + +
PortBindHostSSLIPv6
YesNoYesNo
+ + +
+ + + -
YesNoYesNoYesNo
- - - - +
+

Settings

+
+
+
+
Skin:
+
+ +
+
+
- - +
+
Status Prefix:
+
+
Default for new users only. +
+
- - - +
+
ISpoofFile:
+
+
Example: ~/.oidentd.conf +
- - +
+
ISpoofFormat:
+
+
+
- - - - - - - - - - - - - - - - - - - - - - - + +
"Message of the Day", sent to all ZNC users on connect. + - - - - - - -
Settings
- Skin: - - 1 ?> - - - No other skins found - -
- Status prefix: - - -
- ISpoofFile: - - -
- ISpoofFormat: - - -
- MOTD: - - -
- VHosts: - - -
+
+
One host name or IP entry per line. +
+
+
+ + - - - - +
+

Global Modules

+
+
+
Global Module(s)
+ - + + + - -
- - - - - - - - - - - - - - - - - - -
NameArgumentsDescription
checked="checked" disabled="disabled" />
- 		NameArgumentsDescription
+ + + + + checked="checked" disabled="disabled" /> + + + + + + + + + -

- +
+ +
diff --git a/webskins/_default_/pub/_default_.css b/webskins/_default_/pub/_default_.css index 5208f309..b380640b 100644 --- a/webskins/_default_/pub/_default_.css +++ b/webskins/_default_/pub/_default_.css @@ -1,263 +1,261 @@ -html, -body { - background: #555; - padding: 0; - margin: 10px 0; - background: #444; - font-family: verdana; - font-size: 12px; - color: white; -} +@charset "UTF-8"; -img { - border: 0; - padding: 0; +* { margin: 0; + padding: 0; } -/* TABLES */ - -table { - border-collapse: collapse; - font-size: 12px; +html { + height: 100%; } -table.section, -table.data { - width: 100%; - margin-bottom: 15px; - border: 1px solid #f00; -} - -table.section td, -table.data td { - height: 20px; - border: 1px solid #000; - padding: 2px 3px; -} - -table.section thead td, -table.data thead td { - background-color: #D49712; +body { + height: 100%; + background-color: #fff; color: #000; - font-weight: bold; + font-family: Tahoma, sans-serif; } -table.data thead td { - background-color: #EC8E00; -} - -table.data tbody .altrow td { - background-color: #777; -} - -table.section table.data { - width: 95%; - margin: 10 auto; -} - -table td.tdbottom { - text-align: center; -} - -/* !TABLES */ - -/* FORMS */ - -input, select, textarea { - font-family: verdana; - font-size: 12px; - color: #000000; - border: 1px solid #000000; - background-color: #999; -} - -table.section textarea, -table.section select, -table.section input { - width: 100%; -} - -table.section input.checkbox { - width: auto; -} - -/* !FORMS */ - -.nowrap { - white-space: nowrap; -} - -/* LINKS */ - -a:link, -a:active, -a:visited, -a:hover { - font-family: verdana; - font-size: 12px; - color: #fff; +a, a:link, a:active, a:visited, a:focus { + color: #00008B; text-decoration: none; + outline: none; } a:hover { text-decoration: underline; } -/* !LINKS */ +#main a:visited { + color: #99008B; +} #wrapper { + background-color: #eee; + min-height: 80%; + overflow: hidden; + margin: 0 auto; width: 800px; - border: 1px solid #000; - margin-left: auto; - margin-right: auto; + + border: 1px solid #ccc; + border-top: none; + -moz-box-shadow: 0 0 1em #666; + -webkit-box-shadow: 0 0 1em #666; } -#banner { - background-image: url('clouds-header.jpg'); - padding: 0; - border-bottom: 1px solid #000000; - height: 100px; - width: 800px; - text-align: right; - font-weight: bold; - font-size: 13px; - position: relative; +#banner_top { + background-color: #ccc; } -#banner p { - position: absolute; - bottom: 0; - right: 20px; +h1 { + line-height: 37px; + padding: 0 0.9em 0 0.6em; + width: 50px; + text-align: center; + background-color: #aaa; + font-weight: normal; + font-style: italic; + font-size: 100%; +} + +#tag { + height: 4em; + line-height: 4em; + text-align: center; + font-size: 70%; + color: #aaa; +} + +ul.nav { + float: left; + margin-left: 20px; + list-style: none; +} + +ul.nav li, ul.nav ul { + list-style: none; +} + +ul.nav li.topitem { + float: left; + margin-right: 55px; +} + +ul.nav li.topitem a { + display: inline-block; +} + +ul.nav li.parent ul li { + font-size: 80%; } #infobar { - width: 800px; - height: 20px; - border-bottom: 1px solid #000; - border-right: 1px solid #000; -} - -.successbar, -.errorbar { - width: 790px; - height: 20px; - border-bottom: 1px solid #000; - border-right: 1px solid #000; - background: #900; - padding: 2px 5px; - font-weight: bold; -} - -.successbar { - background: #070; -} - - -#infobar span { - float: left; - padding-left: 5px; -} - -#infobar span.loginbox, -#infobar span.logoutbox { text-align: right; - padding-right: 5px; - border-left: 1px solid #000000; - height: 100%; - width: 250px; - float: right; + clear: both; } -#infobar span.logoutbox { - text-align: center; - width: 100px; +#infobar_ident, .logoutbox, .loginbox { + padding: 4px; + font-size: 70%; + color: #888; } -#infobar span.loginbox input { - width: 60px; -} - -#infobar span.loginbox input.submit { - width: 40px; -} - -#subpage { - padding: 10px; +ul.nav li.topitem:before { + content: "» "; } #content { - float: right; - width: 640px; - padding: 0; - background-color: #444; -} - -/* MENU */ - -#menu { - float: left; - background-color: #333; - width: 160px; - margin: 0; - margin-bottom: 20px; - left: 0; -} - -#menu .title, -#menu .item, -#menu .subitem { - vertical-align: middle; - text-align: center; - padding: 8px 5px; - background-color: #777; - border-bottom: 1px solid #000; - border-right: 1px solid #000; -} - -#menu .title { - text-align: left; - padding-left: 3px; - background-color: #333; - font-weight: bold; -} - -#menu .item.active { - background-color: #D49712; - font-weight: bold; -} - -#menu .subitem { - text-align: left; - padding: 3px 5px 3px 10px; - background-color: #999; -} - -#menu .subitem.active { - font-weight: bold; -} - -#menu .subitem.active a:hover { - color: #000; - text-decoration: none; -} - -#menu a { - color: #000; -} - -/* !MENU */ - -#footerbar { clear: both; - background-color: #D49712; - border-top: 1px solid #000000; - height: 20px; - text-align: right; - padding-right: 5px; } -#breadcrumb { - padding: 5px 10px; - border-bottom: 1px solid #000; +#main { + padding: 0 20px 20px 20px; + + font-size: 90%; +} + +h2 { + margin-bottom: 0.4em; +} + +h3 { + margin-top: 1.2em; + margin-bottom: 0.4em; +} + +.section { + clear: both; +} + +.sectionbody { + margin-left: 1em; +} + +.sectionbody input, textarea, select { + border: 2px solid #ccc; + font-family: Tahoma, sans-serif; + padding: 3px; + font-size: 14px; +} + +input:focus, textarea:focus, select:focus { + -moz-box-shadow: 0 0 0.4em #aaa; + -webkit-box-shadow: 0 0 0.4em #aaa; +} + +textarea { + height: 90px; +} + +div.submitline { + margin: 1em; +} + +.submitline input { + width: 200px; + height: 2.2em; +} + +input.full, textarea.full, +.full input, .full textarea { + width: 600px; +} + +input.twothird, textarea.twothird, +.twothird input, .twothird textarea { + width: 450px; +} + +input.half, textarea.half, +.half input, .half textarea { + width: 300px; +} + +input.third, textarea.third, +.third input, .third textarea { + width: 150px; +} + +table { + border: 1px solid #ccc; +} + +td { + padding: 5px 10px; + min-width: 80px; +} + +thead td { + background-color: #a0a0a0; +} + +tbody td { + background-color: #cecece; +} + +tr.evenrow td { + background-color: #dadada; +} + +.info { + font-style: italic; + font-size: 80%; +} + +.subsection { + clear: both; + margin: 0; +} + +.subsection div { + float: left; +} + +.subsection .inputlabel { + width: 120px; + text-align: right; + padding: 10px 5px 0 0; +} + +.subsection input, .subsection select, .subsection textarea { + margin: 5px 0 5px 0; + vertical-align: middle; +} + +.section .info { + margin-bottom: 5px; + display: block; +} + +.subsection .info { + text-align: right; +} + +.half .info { + width: 435px; +} + +.third .info { + width: 285px; +} + +.twothird .info { + width: 585px; +} + +td.mod_descr, +td.mod_name, +td.mod_args input { + font-size: 80%; +} + +.checkboxandlabel { + white-space: nowrap; +} + +.lotsofcheckboxes .checkboxandlabel { + display: block; + float: left; + width: 200px; + margin-top: 0.5em; } diff --git a/webskins/_default_/pub/clouds-header.jpg b/webskins/_default_/pub/clouds-header.jpg deleted file mode 100644 index f796ad13..00000000 Binary files a/webskins/_default_/pub/clouds-header.jpg and /dev/null differ diff --git a/webskins/_default_/tmpl/Banner.tmpl b/webskins/_default_/tmpl/Banner.tmpl index 61111da8..24a4bba4 100644 --- a/webskins/_default_/tmpl/Banner.tmpl +++ b/webskins/_default_/tmpl/Banner.tmpl @@ -1 +1 @@ - + \ No newline at end of file diff --git a/webskins/_default_/tmpl/Footer.tmpl b/webskins/_default_/tmpl/Footer.tmpl index 75f4e925..d1ffdb03 100644 --- a/webskins/_default_/tmpl/Footer.tmpl +++ b/webskins/_default_/tmpl/Footer.tmpl @@ -12,5 +12,9 @@ + + + + diff --git a/webskins/_default_/tmpl/InfoBar.tmpl b/webskins/_default_/tmpl/InfoBar.tmpl index b54aa2f8..db60c9e6 100644 --- a/webskins/_default_/tmpl/InfoBar.tmpl +++ b/webskins/_default_/tmpl/InfoBar.tmpl @@ -1,4 +1,4 @@
- Logged in as: (from: ) + Logged in as: (from )
diff --git a/webskins/_default_/tmpl/LowerBanner.tmpl b/webskins/_default_/tmpl/LowerBanner.tmpl new file mode 100644 index 00000000..efc7eadc --- /dev/null +++ b/webskins/_default_/tmpl/LowerBanner.tmpl @@ -0,0 +1 @@ +

diff --git a/webskins/_default_/tmpl/Menu.tmpl b/webskins/_default_/tmpl/Menu.tmpl index 38ca0101..c421472b 100644 --- a/webskins/_default_/tmpl/Menu.tmpl +++ b/webskins/_default_/tmpl/Menu.tmpl @@ -1,24 +1,32 @@ - diff --git a/webskins/dark-clouds/pub/dark-clouds.css b/webskins/dark-clouds/pub/dark-clouds.css index 5208f309..690ad44b 100644 --- a/webskins/dark-clouds/pub/dark-clouds.css +++ b/webskins/dark-clouds/pub/dark-clouds.css @@ -18,49 +18,65 @@ img { /* TABLES */ table { - border-collapse: collapse; font-size: 12px; -} - -table.section, -table.data { width: 100%; margin-bottom: 15px; - border: 1px solid #f00; + border-collapse: collapse; } -table.section td, -table.data td { +table thead td { + background-color: #EC8E00; + color: #000; + font-weight: bold; + padding: 2px; +} + +table td { height: 20px; - border: 1px solid #000; padding: 2px 3px; + border: 1px solid #000; } -table.section thead td, -table.data thead td { +/* !TABLES */ + +/* SECTIONS */ + +.section { + border: 1px solid #000; + padding: 0; + margin-bottom: 1em; +} + +h3 { + margin: 0; + padding: 5px; background-color: #D49712; color: #000; font-weight: bold; } -table.data thead td { - background-color: #EC8E00; +.sectionbody { + padding: 10px; } -table.data tbody .altrow td { - background-color: #777; +.subsection { + clear: both; } -table.section table.data { - width: 95%; - margin: 10 auto; +.subsection div { + min-height: 30px; + /*float: left; + border: 1px solid orange;*/ + display: inline-block; } -table td.tdbottom { - text-align: center; +.subsection .inputlabel { + + width: 200px; + height: 30px; } -/* !TABLES */ +/* !SECTIONS */ /* FORMS */ @@ -154,7 +170,7 @@ a:hover { } -#infobar span { +#infobar_ident { float: left; padding-left: 5px; } @@ -182,6 +198,10 @@ a:hover { width: 40px; } +#infobar_ident .user_name { + font-style: italic; +} + #subpage { padding: 10px; } @@ -204,10 +224,21 @@ a:hover { left: 0; } +#menu ul, #menu li { + list-style: none; + display: block; + margin: 0; + padding: 0; +} + +#menu li.parent span.title { + display: block; +} + #menu .title, -#menu .item, +#menu .topitem, +#menu .modtitle, #menu .subitem { - vertical-align: middle; text-align: center; padding: 8px 5px; background-color: #777; @@ -215,6 +246,11 @@ a:hover { border-right: 1px solid #000; } +#menu .parent { + padding: 0; + border: none; +} + #menu .title { text-align: left; padding-left: 3px; diff --git a/webskins/dark-clouds/tmpl/Banner.tmpl b/webskins/dark-clouds/tmpl/Banner.tmpl new file mode 100644 index 00000000..61111da8 --- /dev/null +++ b/webskins/dark-clouds/tmpl/Banner.tmpl @@ -0,0 +1 @@ + diff --git a/webskins/dark-clouds/tmpl/LowerBanner.tmpl b/webskins/dark-clouds/tmpl/LowerBanner.tmpl new file mode 100644 index 00000000..e69de29b diff --git a/webskins/forest/tmpl/Banner.tmpl b/webskins/forest/tmpl/Banner.tmpl new file mode 100644 index 00000000..61111da8 --- /dev/null +++ b/webskins/forest/tmpl/Banner.tmpl @@ -0,0 +1 @@ + diff --git a/webskins/forest/tmpl/LowerBanner.tmpl b/webskins/forest/tmpl/LowerBanner.tmpl new file mode 100644 index 00000000..e69de29b diff --git a/webskins/ice/pub/ice.css b/webskins/ice/pub/ice.css index 8a987cfa..aae389de 100644 --- a/webskins/ice/pub/ice.css +++ b/webskins/ice/pub/ice.css @@ -152,6 +152,12 @@ textarea { margin-bottom: 10px; } +#menu ul, #menu li { + list-style: none; + padding: 0; + margin: 0; +} + #gnav { width: 700px; border-top: 1px solid #000; @@ -161,21 +167,12 @@ textarea { margin-bottom: 10px; } -#gnav #menu { +#menu ul.nav { width: 690px; float: left; } -#gnav ul { - margin: 0px; - padding: 0px; -} - -#gnav li { - display: block; -} - -#gnav a { +#menu a { font-size: 12px; font-weight: bold; height: 30px; @@ -187,22 +184,19 @@ textarea { background: url(linkbg.jpg) 0px 0px repeat-x; } -#gnav a:hover { +#menu a:hover { background-position: 0px -30px; text-decoration: none; } -#gnav .on a { +#menu a.active { background-position: 0px -30px; } -#gnav #nav { +#menu { float: left; border-left: 1px solid #000; display: inline; -} - -#nav { margin-left: 10px; } @@ -212,4 +206,3 @@ textarea { border-right: 1px solid #000; float: left; } - diff --git a/webskins/ice/tmpl/LowerBanner.tmpl b/webskins/ice/tmpl/LowerBanner.tmpl new file mode 100644 index 00000000..e69de29b