diff --git a/WebModules.cpp b/WebModules.cpp index c288e3b5..ac1664e0 100644 --- a/WebModules.cpp +++ b/WebModules.cpp @@ -555,6 +555,23 @@ CWebSock::EPageReqResult CWebSock::OnPageRequestInternal(const CString& sURI, CS return PrintTemplate("login", sPageRet); } else if (sURI.Left(5) == "/pub/") { return PrintStaticFile(sURI, sPageRet); + } else if (sURI.Left(11) == "/skinfiles/") { + CString sSkinName = sURI.substr(11); + CString::size_type uPathStart = sSkinName.find("/"); + if (uPathStart != CString::npos) { + CString sFilePath = sSkinName.substr(uPathStart + 1); + sSkinName.erase(uPathStart); + + m_Template.ClearPaths(); + m_Template.AppendPath(GetSkinPath(sSkinName) + "pub"); + + if (PrintFile(m_Template.ExpandFile(sFilePath))) { + return PAGE_DONE; + } else { + return PAGE_NOTFOUND; + } + } + return PAGE_NOTFOUND; } else if (sURI.Left(6) == "/mods/" || sURI.Left(10) == "/modfiles/") { ParsePath(); // Make sure modules are treated as directories diff --git a/modules/webadmin/skins/dark-clouds/Channel.tmpl b/modules/webadmin/skins/dark-clouds/Channel.tmpl deleted file mode 100644 index f53146cc..00000000 --- a/modules/webadmin/skins/dark-clouds/Channel.tmpl +++ /dev/null @@ -1,74 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Channel Info
- Channel Name: - - - - - -
- -
- Buffer Count: - - -
- Default Modes: - - -
- Save: - - checked="checked" /> -
- Options: - - - checked="checked" disabled="disabled" />
- -
- -

-
- - - diff --git a/modules/webadmin/skins/dark-clouds/Error.tmpl b/modules/webadmin/skins/dark-clouds/Error.tmpl deleted file mode 100644 index fd67768f..00000000 --- a/modules/webadmin/skins/dark-clouds/Error.tmpl +++ /dev/null @@ -1,3 +0,0 @@ - -

- diff --git a/modules/webadmin/skins/dark-clouds/Footer.tmpl b/modules/webadmin/skins/dark-clouds/Footer.tmpl deleted file mode 100644 index dfb02cc5..00000000 --- a/modules/webadmin/skins/dark-clouds/Footer.tmpl +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - ZNC WebAdmin style "dark-clouds" by David Precious - - - - - - - - diff --git a/modules/webadmin/skins/dark-clouds/Header.tmpl b/modules/webadmin/skins/dark-clouds/Header.tmpl deleted file mode 100644 index fe0ff7ea..00000000 --- a/modules/webadmin/skins/dark-clouds/Header.tmpl +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - ZNC - Webadmin module - <?VAR Title ESC=HTML?> - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
Logged in as: (from: )Logout
-
- - - - - - - - - - - - - - - - - - - - -
inactive">Home
inactive">Settings
inactive">Add User
inactive">List Users
inactive">My Settings
- 		-
ZNC Webadmin »
diff --git a/modules/webadmin/skins/dark-clouds/ListUsers.tmpl b/modules/webadmin/skins/dark-clouds/ListUsers.tmpl deleted file mode 100644 index d8565747..00000000 --- a/modules/webadmin/skins/dark-clouds/ListUsers.tmpl +++ /dev/null @@ -1,33 +0,0 @@ - - - - There are no users defined.
- Click here, if you would like to add one. - - - - - - - - - - - - - - - - - - - - -
ActionUsernameClientsCurrent ServerIRC Nick
- - [Edit] - [Delete] - -
- - diff --git a/modules/webadmin/skins/dark-clouds/Main.tmpl b/modules/webadmin/skins/dark-clouds/Main.tmpl deleted file mode 100644 index 1c1c53f7..00000000 --- a/modules/webadmin/skins/dark-clouds/Main.tmpl +++ /dev/null @@ -1,3 +0,0 @@ - - Welcome to the ZNC webadmin module. - diff --git a/modules/webadmin/skins/dark-clouds/Settings.tmpl b/modules/webadmin/skins/dark-clouds/Settings.tmpl deleted file mode 100644 index c7715850..00000000 --- a/modules/webadmin/skins/dark-clouds/Settings.tmpl +++ /dev/null @@ -1,139 +0,0 @@ - - -
- - - - - - - - - - -
Listen Port(s)
- - - - - - - - - - - - - - - - -
PortBindHostSSLIPv6
TrueFalseTrueFalse
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Settings
- Skin: - - -
- Status prefix: - - -
- ISpoofFile: - - -
- ISpoofFormat: - - -
- MOTD: - - -
- VHosts: - - -
- - - - - - - - - -
Global Module(s)
- - - - - - - - - - - - - - -
NameArgumentsDescription
checked="checked" disabled="disabled" />
-
- -

- -
- - diff --git a/modules/webadmin/skins/dark-clouds/UserPage.tmpl b/modules/webadmin/skins/dark-clouds/UserPage.tmpl deleted file mode 100644 index 0ced1b01..00000000 --- a/modules/webadmin/skins/dark-clouds/UserPage.tmpl +++ /dev/null @@ -1,320 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Authentication
- Username: - - - - - - - -
- Password: - - -
- Confirm password: - - -
- Allowed IPs: - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
IRC Information
- Nickname: - - -
- Alt. Nickname: - - -
- Status Prefix: - - -
- Ident: - - -
- Realname: - - -
- VHost: - - -
- Quit-MSG: - - -
- Servers: - - -
- - - - - - - - - -
Module(s)
- - - - - - - - - - - - - - -
NameArgumentsDescription
- checked="checked" disabled="disabled" /> - - -
-
- - - - - - - - - - - - - - - - -
Channel(s)
- Default Modes: - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
[Add]SaveNameCurModesDefModesBufferCountOptions- Add a channel (opens in same page)
- - [Edit] [Del] - checked="checked" />
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ZNC Behavior
- Playback Buffer Size: - - -
- Timestamp Format: - - -
- Timezone offset: - - -
- Join Tries: - - -
- Max Joins: - - -
- Options: - - - checked="checked" disabled="disabled" />
- -
- CTCP Replies: - - -
- - -

-
- - diff --git a/modules/webadmin/skins/dark-clouds/data/main.css b/modules/webadmin/skins/dark-clouds/data/main.css deleted file mode 100644 index dedb3142..00000000 --- a/modules/webadmin/skins/dark-clouds/data/main.css +++ /dev/null @@ -1,221 +0,0 @@ -body { - background: #555; - margin-top: 10px; - background: #444; -} - -td { - font-family: verdana; - font-size: 12px; - color: white; -} - -input, select, textarea { - font-family: verdana; - font-size: 12px; - color: #000000; - border: 1px solid #000000; - background-color: #999; -} - -a:link, a:active, a:visited { - font-family: verdana; - font-size: 12px; - color: #E9630A; - text-decoration: none; -} - -a:hover { - font-family: verdana; - font-size: 12px; - color: #E9A640; - text-decoration: underline; -} - -.header { - background-image: url('clouds-header.jpg'); - padding: 10px; - border: 1px solid #000000; - height: 100px; - width: 800px; - vertical-align: bottom; - text-align: right; - font-weight: bold; - font-size: 13px; -} - -.loginbar { - border-left: 1px solid #000000; - border-bottom: 1px solid #000000; - border-right: 1px solid #000000; - background-color: #444; - height: 20px; -} - -.switchuser { - border-left: 1px solid #000000; - text-align: center; - vertical-align: middle; - width: 150px; -} - -.switchuser a:link, .switchuser a:active, .switchuser a:visited { - font-family: verdana; - font-size: 12px; - color: white; - text-decoration: none; -} - -.switchuser a:hover { - font-family: verdana; - font-size: 12px; - color: white; - text-decoration: underline; -} - -.menu { - width: 160px; - background-color: #333; - border-left: 1px solid #000000; - vertical-align: top; - padding-bottom: 20px; -} - -.menuactive { - vertical-align: middle; - text-align: center; - height: 30px; - background-color: #D49712; - font-weight: bold; - border-bottom: 1px solid #000000; -} - -.menuinactive { - vertical-align: middle; - text-align: center; - height: 30px; - background-color: #777; - border-right: 1px solid #000000; - border-bottom: 1px solid #000000; -} - -.menuactive a:link, .menuactive a:active, .menuactive a:visited { - font-family: verdana; - font-size: 12px; - color: #000000; - text-decoration: none; -} - -.menuactive a:hover { - font-family: verdana; - font-size: 12px; - color: #3B98F5; - text-decoration: underline; -} - -.menuinactive a:link, .menuinactive a:active, .menuinactive a:visited { - font-family: verdana; - font-size: 12px; - color: #000000; - text-decoration: none; -} - -.menuinactive a:hover { - font-family: verdana; - font-size: 12px; - color: #FFFFFF; - text-decoration: underline; -} - -.main { - width: 640px; - vertical-align: top; - padding: 15px; - background-color: #444; - border-right: 1px solid #000000; -} - -.cbar { - border: 1px solid #000000; - background-color: #D49712; - height: 20px; - text-align: right; - padding-right: 5px; -} - -.cbar a:link, .cbar a:active, .cbar a:visited { - font-family: verdana; - font-size: 12px; - color: #000000; - text-decoration: none; -} - -.cbar a:hover { - font-family: verdana; - font-size: 12px; - color: #FFFFFF; - text-decoration: underline; -} - -.maintitle { - height: 20px; - background-color: #D49712; - color: #000000; - font-weight: bold; - padding-left: 5px; - border: 1px solid #000000; -} - -.mainalone { - padding: 10px; - border-bottom: 1px solid #000000; - border-left: 1px solid #000000; - border-right: 1px solid #000000; -} - -.mainleft { - height: 30px; - padding: 5px; - font-weight: bold; - border-bottom: 1px solid #000000; - border-left: 1px solid #000000; - border-right: 1px solid #000000; -} - -.mainright { - padding: 5px; - border-bottom: 1px solid #000000; - border-right: 1px solid #000000; -} - -.mainrow { - padding: 5px; - border-right: 1px solid #000000; -} - -.main2title { - height: 20px; - background-color: #EC8E00; - color: #000000; - font-weight: bold; - padding-left: 2px; -} - -.oddrow { - height: 20px; -} - -.oddrow td { - padding: 2px; - border-right: 1px solid #000000; -} - -.evenrow { - height: 20px; - background-color: #777; -} - -.evenrow td { - padding: 2px; - border-right: 1px solid #000000; -} diff --git a/modules/webadmin/skins/default/Channel.tmpl b/modules/webadmin/skins/default/Channel.tmpl deleted file mode 100644 index 1b4bbad5..00000000 --- a/modules/webadmin/skins/default/Channel.tmpl +++ /dev/null @@ -1,59 +0,0 @@ - - -
-
- - - - -

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" /> - - - -
-
-
-
- -
- -
-
- - - diff --git a/modules/webadmin/skins/default/Error.tmpl b/modules/webadmin/skins/default/Error.tmpl deleted file mode 100644 index 119093fe..00000000 --- a/modules/webadmin/skins/default/Error.tmpl +++ /dev/null @@ -1,3 +0,0 @@ - -

- diff --git a/modules/webadmin/skins/default/Footer.tmpl b/modules/webadmin/skins/default/Footer.tmpl deleted file mode 100644 index aa2a8eb9..00000000 --- a/modules/webadmin/skins/default/Footer.tmpl +++ /dev/null @@ -1,5 +0,0 @@ - - -
- - diff --git a/modules/webadmin/skins/default/Header.tmpl b/modules/webadmin/skins/default/Header.tmpl deleted file mode 100644 index 510395b1..00000000 --- a/modules/webadmin/skins/default/Header.tmpl +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - ZNC - <?VAR Title ESC=HTML?> - - - -
- - -
(from: )
- -
-

- diff --git a/modules/webadmin/skins/default/ListUsers.tmpl b/modules/webadmin/skins/default/ListUsers.tmpl deleted file mode 100644 index fab9def8..00000000 --- a/modules/webadmin/skins/default/ListUsers.tmpl +++ /dev/null @@ -1,34 +0,0 @@ - - - There are no users defined. Click here if you would like to add one. - - - - - - - - - - - - - - - - - - - - - - - -
ActionUsernameClientsCurrent ServerIRC Nick
- - [Edit] - [Delete] - -
- - diff --git a/modules/webadmin/skins/default/Main.tmpl b/modules/webadmin/skins/default/Main.tmpl deleted file mode 100644 index 1c1c53f7..00000000 --- a/modules/webadmin/skins/default/Main.tmpl +++ /dev/null @@ -1,3 +0,0 @@ - - Welcome to the ZNC webadmin module. - diff --git a/modules/webadmin/skins/default/Settings.tmpl b/modules/webadmin/skins/default/Settings.tmpl deleted file mode 100644 index 458cd6c1..00000000 --- a/modules/webadmin/skins/default/Settings.tmpl +++ /dev/null @@ -1,125 +0,0 @@ - - -
-
- - -

Listen Port(s)

-
-
-
-
- - - - - - - - - - - - - - - - - - - -
PortBindHostSSLIPv6
YesNoYesNo
-
-
-
-
-
-
- -
-

Settings

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

Global Modules

-
-
- - - - - - - - - - - - - - - - - -
NameArgumentsDescription
checked="checked" disabled="disabled" />
-
-
-
- -
- -
-
- - diff --git a/modules/webadmin/skins/default/UserPage.tmpl b/modules/webadmin/skins/default/UserPage.tmpl deleted file mode 100644 index 25a7e72a..00000000 --- a/modules/webadmin/skins/default/UserPage.tmpl +++ /dev/null @@ -1,251 +0,0 @@ - - -
-
- - -

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:
-
-
-
- -
- -
VHost:
- - -
-
- -
-
QuitMsg:
-
-
-
- -
-
Servers:
-
-
One server per line, host [+]port[ password] -
-
-
-
-
- -
-

Modules

-
-
- - - - - - - - - - - - - - - - - - - -
NameArgumentsDescription
- checked="checked" disabled="disabled" /> - - -
-
-
-
- -
-

Channels

- - You will be able to add + modify channels here after you created the user.
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
[Add]SaveNameCurModesDefModesBufferCountOptions  <- Add a channel (opens in same page)  
- - [Edit] [Del] - checked="checked" />
-
-
- -
- -
-

Default Channel Settings

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

Flags

-
-
- - - checked="checked" disabled="disabled" /> - - - -
-
-
-
- -
-

ZNC Behavior

- Any of the following text boxes can be left empty to use their default value. -
-
-
-
Timestamp Format:
-
-
-
-
Timezone Offset:
-
-
-
-
Join Tries:
-
-
-
-
Max Joins:
-
-
-
-
CTCP Replies:
-
-
One reply per line. Example: TIME Buy a watch! -
-
-
-
-
- -
- -
-
- - diff --git a/modules/webadmin/skins/default/data/favicon.ico b/modules/webadmin/skins/default/data/favicon.ico deleted file mode 100644 index 5e28bcf0..00000000 Binary files a/modules/webadmin/skins/default/data/favicon.ico and /dev/null differ diff --git a/modules/webadmin/skins/default/data/main.css b/modules/webadmin/skins/default/data/main.css deleted file mode 100644 index bb9ac82d..00000000 --- a/modules/webadmin/skins/default/data/main.css +++ /dev/null @@ -1,249 +0,0 @@ -@charset "UTF-8"; - -* { - margin: 0; - padding: 0; -} - -html { - height: 100%; -} - -body { - height: 100%; - background-color: #fff; - color: #000; - font-family: Tahoma, sans-serif; -} - -a, a:link, a:active, a:visited, a:focus { - color: #00008B; - text-decoration: none; - outline: none; -} - -a:hover { - text-decoration: underline; -} - -#main a:visited { - color: #99008B; -} - -#container { - background-color: #eee; - min-height: 80%; - overflow: hidden; - margin: 0 auto; - width: 800px; - - border: 1px solid #ccc; - border-top: none; - -moz-box-shadow: 0 0 1em #666; - -webkit-box-shadow: 0 0 1em #666; -} - -#tag { - height: 4em; - line-height: 4em; - text-align: center; - font-size: 70%; - color: #aaa; -} - -#navbar { - display: block; - height: 45px; - background-color: #ccc; -} - -#navbar h1 { - float: left; - line-height: 45px; - padding: 0 0.9em 0 0.6em; - font-style: italic; - background-color: #aaa; - font-size: 100%; - font-weight: normal; -} - -ul.nav { - float: left; - margin-left: 20px; -} - -ul.nav li { - list-style: none; - float: left; - margin-right: 55px; -} - -ul.nav li a { - line-height: 45px; - height: 45px; - display: inline-block; -} - -#ident { - text-align: right; - padding: 4px; - font-size: 70%; - color: #888; -} - -ul.nav li:before { - content: "» "; -} - -#main { - clear: both; - 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; -} - -.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; -} - -div.submitline { - margin: 1em; -} - -.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/modules/webadmin/skins/graphiX/Channel.tmpl b/modules/webadmin/skins/graphiX/Channel.tmpl deleted file mode 100644 index f53146cc..00000000 --- a/modules/webadmin/skins/graphiX/Channel.tmpl +++ /dev/null @@ -1,74 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Channel Info
- Channel Name: - - - - - -
- -
- Buffer Count: - - -
- Default Modes: - - -
- Save: - - checked="checked" /> -
- Options: - - - checked="checked" disabled="disabled" />
- -
- -

-
- - - diff --git a/modules/webadmin/skins/graphiX/Error.tmpl b/modules/webadmin/skins/graphiX/Error.tmpl deleted file mode 100644 index fd67768f..00000000 --- a/modules/webadmin/skins/graphiX/Error.tmpl +++ /dev/null @@ -1,3 +0,0 @@ - -

- diff --git a/modules/webadmin/skins/graphiX/Footer.tmpl b/modules/webadmin/skins/graphiX/Footer.tmpl deleted file mode 100644 index 007844f2..00000000 --- a/modules/webadmin/skins/graphiX/Footer.tmpl +++ /dev/null @@ -1,17 +0,0 @@ -
- ZNC WebAdmin style "graphiX" by d4n13L -
-
- - \ No newline at end of file diff --git a/modules/webadmin/skins/graphiX/Header.tmpl b/modules/webadmin/skins/graphiX/Header.tmpl deleted file mode 100644 index fe0ff7ea..00000000 --- a/modules/webadmin/skins/graphiX/Header.tmpl +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - ZNC - Webadmin module - <?VAR Title ESC=HTML?> - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/webskins/_default_/pub/favicon.ico b/webskins/_default_/pub/favicon.ico index 73ba0473..5e28bcf0 100644 Binary files a/webskins/_default_/pub/favicon.ico and b/webskins/_default_/pub/favicon.ico differ diff --git a/webskins/_default_/tmpl/BaseHeader.tmpl b/webskins/_default_/tmpl/BaseHeader.tmpl index 9c98000a..a7d1b1ac 100644 --- a/webskins/_default_/tmpl/BaseHeader.tmpl +++ b/webskins/_default_/tmpl/BaseHeader.tmpl @@ -1,10 +1,9 @@ - + - + ZNC - <? VAR Title DEFAULT="Web Frontend" ?> - diff --git a/webskins/_default_/tmpl/DocType.tmpl b/webskins/_default_/tmpl/DocType.tmpl index a4a1b548..2493471f 100644 --- a/webskins/_default_/tmpl/DocType.tmpl +++ b/webskins/_default_/tmpl/DocType.tmpl @@ -1 +1,2 @@ - + + \ No newline at end of file diff --git a/webskins/_default_/tmpl/FooterTag.tmpl b/webskins/_default_/tmpl/FooterTag.tmpl index 66218685..e69de29b 100644 --- a/webskins/_default_/tmpl/FooterTag.tmpl +++ b/webskins/_default_/tmpl/FooterTag.tmpl @@ -1 +0,0 @@ - ZNC Web Skin "dark-clouds" by David Precious diff --git a/webskins/_default_/tmpl/Header.tmpl b/webskins/_default_/tmpl/Header.tmpl index 3bdc7a6a..7fcbdfd2 100644 --- a/webskins/_default_/tmpl/Header.tmpl +++ b/webskins/_default_/tmpl/Header.tmpl @@ -1,3 +1,4 @@ + diff --git a/modules/webadmin/skins/dark-clouds/data/clouds-header.jpg b/webskins/dark-clouds/pub/clouds-header.jpg similarity index 100% rename from modules/webadmin/skins/dark-clouds/data/clouds-header.jpg rename to webskins/dark-clouds/pub/clouds-header.jpg diff --git a/webskins/dark-clouds/pub/dark-clouds.css b/webskins/dark-clouds/pub/dark-clouds.css new file mode 100644 index 00000000..5208f309 --- /dev/null +++ b/webskins/dark-clouds/pub/dark-clouds.css @@ -0,0 +1,263 @@ +html, +body { + background: #555; + padding: 0; + margin: 10px 0; + background: #444; + font-family: verdana; + font-size: 12px; + color: white; +} + +img { + border: 0; + padding: 0; + margin: 0; +} + +/* TABLES */ + +table { + border-collapse: collapse; + font-size: 12px; +} + +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; + color: #000; + font-weight: bold; +} + +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; + text-decoration: none; +} + +a:hover { + text-decoration: underline; +} + +/* !LINKS */ + +#wrapper { + width: 800px; + border: 1px solid #000; + margin-left: auto; + margin-right: auto; +} + +#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 p { + position: absolute; + bottom: 0; + right: 20px; +} + +#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; +} + +#infobar span.logoutbox { + text-align: center; + width: 100px; +} + +#infobar span.loginbox input { + width: 60px; +} + +#infobar span.loginbox input.submit { + width: 40px; +} + +#subpage { + padding: 10px; +} + +#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; +} diff --git a/webskins/dark-clouds/pub/favicon.ico b/webskins/dark-clouds/pub/favicon.ico new file mode 100644 index 00000000..73ba0473 Binary files /dev/null and b/webskins/dark-clouds/pub/favicon.ico differ diff --git a/webskins/dark-clouds/tmpl/FooterTag.tmpl b/webskins/dark-clouds/tmpl/FooterTag.tmpl new file mode 100644 index 00000000..66218685 --- /dev/null +++ b/webskins/dark-clouds/tmpl/FooterTag.tmpl @@ -0,0 +1 @@ + ZNC Web Skin "dark-clouds" by David Precious diff --git a/webskins/dark-clouds/tmpl/Header.tmpl b/webskins/dark-clouds/tmpl/Header.tmpl new file mode 100644 index 00000000..3f7a7ee4 --- /dev/null +++ b/webskins/dark-clouds/tmpl/Header.tmpl @@ -0,0 +1,2 @@ + + diff --git a/webskins/forest/tmpl/Header.tmpl b/webskins/forest/tmpl/Header.tmpl index 94e4975e..0ca9d8ca 100644 --- a/webskins/forest/tmpl/Header.tmpl +++ b/webskins/forest/tmpl/Header.tmpl @@ -1,2 +1,3 @@ + diff --git a/modules/webadmin/skins/dark-clouds/data/favicon.ico b/webskins/ice/pub/favicon.ico similarity index 100% rename from modules/webadmin/skins/dark-clouds/data/favicon.ico rename to webskins/ice/pub/favicon.ico diff --git a/modules/webadmin/skins/ice/data/main.css b/webskins/ice/pub/ice.css similarity index 100% rename from modules/webadmin/skins/ice/data/main.css rename to webskins/ice/pub/ice.css diff --git a/modules/webadmin/skins/ice/data/linkbg.jpg b/webskins/ice/pub/linkbg.jpg similarity index 100% rename from modules/webadmin/skins/ice/data/linkbg.jpg rename to webskins/ice/pub/linkbg.jpg diff --git a/modules/webadmin/skins/ice/data/pagebg.gif b/webskins/ice/pub/pagebg.gif similarity index 100% rename from modules/webadmin/skins/ice/data/pagebg.gif rename to webskins/ice/pub/pagebg.gif diff --git a/webskins/ice/tmpl/FooterTag.tmpl b/webskins/ice/tmpl/FooterTag.tmpl new file mode 100644 index 00000000..e69de29b diff --git a/webskins/ice/tmpl/Header.tmpl b/webskins/ice/tmpl/Header.tmpl new file mode 100644 index 00000000..1258f74c --- /dev/null +++ b/webskins/ice/tmpl/Header.tmpl @@ -0,0 +1,2 @@ + +
- - - - - -
Logged in as: (from: )Logout
-
- - - - - - - - - - - - - - - - - - - - -
inactive">Home
inactive">Settings
inactive">Add User
inactive">List Users
inactive">My Settings
- 		-
ZNC Webadmin »
diff --git a/modules/webadmin/skins/graphiX/ListUsers.tmpl b/modules/webadmin/skins/graphiX/ListUsers.tmpl deleted file mode 100644 index d8565747..00000000 --- a/modules/webadmin/skins/graphiX/ListUsers.tmpl +++ /dev/null @@ -1,33 +0,0 @@ - - - - There are no users defined.
- Click here, if you would like to add one. - - - - - - - - - - - - - - - - - - - - -
ActionUsernameClientsCurrent ServerIRC Nick
- - [Edit] - [Delete] - -
- - diff --git a/modules/webadmin/skins/graphiX/Main.tmpl b/modules/webadmin/skins/graphiX/Main.tmpl deleted file mode 100644 index 1c1c53f7..00000000 --- a/modules/webadmin/skins/graphiX/Main.tmpl +++ /dev/null @@ -1,3 +0,0 @@ - - Welcome to the ZNC webadmin module. - diff --git a/modules/webadmin/skins/graphiX/Settings.tmpl b/modules/webadmin/skins/graphiX/Settings.tmpl deleted file mode 100644 index c7715850..00000000 --- a/modules/webadmin/skins/graphiX/Settings.tmpl +++ /dev/null @@ -1,139 +0,0 @@ - - -
- - - - - - - - - - -
Listen Port(s)
- - - - - - - - - - - - - - - - -
PortBindHostSSLIPv6
TrueFalseTrueFalse
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Settings
- Skin: - - -
- Status prefix: - - -
- ISpoofFile: - - -
- ISpoofFormat: - - -
- MOTD: - - -
- VHosts: - - -
- - - - - - - - - -
Global Module(s)
- - - - - - - - - - - - - - -
NameArgumentsDescription
checked="checked" disabled="disabled" />
-
- -

- -
- - diff --git a/modules/webadmin/skins/graphiX/UserPage.tmpl b/modules/webadmin/skins/graphiX/UserPage.tmpl deleted file mode 100644 index 0ced1b01..00000000 --- a/modules/webadmin/skins/graphiX/UserPage.tmpl +++ /dev/null @@ -1,320 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Authentication
- Username: - - - - - - - -
- Password: - - -
- Confirm password: - - -
- Allowed IPs: - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
IRC Information
- Nickname: - - -
- Alt. Nickname: - - -
- Status Prefix: - - -
- Ident: - - -
- Realname: - - -
- VHost: - - -
- Quit-MSG: - - -
- Servers: - - -
- - - - - - - - - -
Module(s)
- - - - - - - - - - - - - - -
NameArgumentsDescription
- checked="checked" disabled="disabled" /> - - -
-
- - - - - - - - - - - - - - - - -
Channel(s)
- Default Modes: - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
[Add]SaveNameCurModesDefModesBufferCountOptions- Add a channel (opens in same page)
- - [Edit] [Del] - checked="checked" />
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ZNC Behavior
- Playback Buffer Size: - - -
- Timestamp Format: - - -
- Timezone offset: - - -
- Join Tries: - - -
- Max Joins: - - -
- Options: - - - checked="checked" disabled="disabled" />
- -
- CTCP Replies: - - -
- - -

-
- - diff --git a/modules/webadmin/skins/graphiX/data/favicon.ico b/modules/webadmin/skins/graphiX/data/favicon.ico deleted file mode 100644 index 5e28bcf0..00000000 Binary files a/modules/webadmin/skins/graphiX/data/favicon.ico and /dev/null differ diff --git a/modules/webadmin/skins/graphiX/data/graphix_bg.jpg b/modules/webadmin/skins/graphiX/data/graphix_bg.jpg deleted file mode 100644 index 3346ebbe..00000000 Binary files a/modules/webadmin/skins/graphiX/data/graphix_bg.jpg and /dev/null differ diff --git a/modules/webadmin/skins/graphiX/data/graphix_header.jpg b/modules/webadmin/skins/graphiX/data/graphix_header.jpg deleted file mode 100644 index 1443c9f9..00000000 Binary files a/modules/webadmin/skins/graphiX/data/graphix_header.jpg and /dev/null differ diff --git a/modules/webadmin/skins/graphiX/data/main.css b/modules/webadmin/skins/graphiX/data/main.css deleted file mode 100644 index 3fcc4910..00000000 --- a/modules/webadmin/skins/graphiX/data/main.css +++ /dev/null @@ -1,220 +0,0 @@ -body { - background-image: url('graphix_bg.jpg'); - margin-top: 10px; -} - -td { - font-family: verdana; - font-size: 12px; - color: #000000; -} - -input, select, textarea { - font-family: verdana; - font-size: 12px; - color: #000000; - border: 1px solid #000000; - background-color: #C8EAFC; -} - -a:link, a:active, a:visited { - font-family: verdana; - font-size: 12px; - color: #000000; - text-decoration: none; -} - -a:hover { - font-family: verdana; - font-size: 12px; - color: #000000; - text-decoration: underline; -} - -.header { - background-image: url('graphix_header.jpg'); - padding: 10px; - border: 1px solid #000000; - height: 100px; - width: 800px; - vertical-align: bottom; - text-align: right; - font-weight: bold; - font-size: 13px; -} - -.loginbar { - border-left: 1px solid #000000; - border-bottom: 1px solid #000000; - border-right: 1px solid #000000; - background-color: #3B98F5; - height: 20px; -} - -.switchuser { - border-left: 1px solid #000000; - text-align: center; - vertical-align: middle; - width: 150px; -} - -.switchuser a:link, .switchuser a:active, .switchuser a:visited { - font-family: verdana; - font-size: 12px; - color: #000000; - text-decoration: none; -} - -.switchuser a:hover { - font-family: verdana; - font-size: 12px; - color: #FFFFFF; - text-decoration: underline; -} - -.menu { - width: 160px; - background-color: #B4D8FC; - border-left: 1px solid #000000; - vertical-align: top; - padding-bottom: 20px; -} - -.menuactive { - vertical-align: middle; - text-align: center; - height: 30px; - background-color: #FFFFFF; - font-weight: bold; - border-bottom: 1px solid #000000; -} - -.menuinactive { - vertical-align: middle; - text-align: center; - height: 30px; - background-color: #3B98F5; - border-right: 1px solid #000000; - border-bottom: 1px solid #000000; -} - -.menuactive a:link, .menuactive a:active, .menuactive a:visited { - font-family: verdana; - font-size: 12px; - color: #000000; - text-decoration: none; -} - -.menuactive a:hover { - font-family: verdana; - font-size: 12px; - color: #3B98F5; - text-decoration: underline; -} - -.menuinactive a:link, .menuinactive a:active, .menuinactive a:visited { - font-family: verdana; - font-size: 12px; - color: #000000; - text-decoration: none; -} - -.menuinactive a:hover { - font-family: verdana; - font-size: 12px; - color: #FFFFFF; - text-decoration: underline; -} - -.main { - width: 640px; - vertical-align: top; - padding: 15px; - background-color: #FFFFFF; - border-right: 1px solid #000000; -} - -.cbar { - border: 1px solid #000000; - background-color: #3B98F5; - height: 20px; - text-align: right; - padding-right: 5px; -} - -.cbar a:link, .cbar a:active, .cbar a:visited { - font-family: verdana; - font-size: 12px; - color: #000000; - text-decoration: none; -} - -.cbar a:hover { - font-family: verdana; - font-size: 12px; - color: #FFFFFF; - text-decoration: underline; -} - -.maintitle { - height: 20px; - background-color: #3B98F5; - color: #000000; - font-weight: bold; - padding-left: 5px; - border: 1px solid #000000; -} - -.mainalone { - padding: 10px; - border-bottom: 1px solid #000000; - border-left: 1px solid #000000; - border-right: 1px solid #000000; -} - -.mainleft { - height: 30px; - padding: 5px; - font-weight: bold; - border-bottom: 1px solid #000000; - border-left: 1px solid #000000; - border-right: 1px solid #000000; -} - -.mainright { - padding: 5px; - border-bottom: 1px solid #000000; - border-right: 1px solid #000000; -} - -.mainrow { - padding: 5px; - border-right: 1px solid #000000; -} - -.main2title { - height: 20px; - background-color: #3B98F5; - color: #000000; - font-weight: bold; - padding-left: 2px; -} - -.oddrow { - height: 20px; -} - -.oddrow td { - padding: 2px; - border-right: 1px solid #000000; -} - -.evenrow { - height: 20px; - background-color: #C8EAFC; -} - -.evenrow td { - padding: 2px; - border-right: 1px solid #000000; -} diff --git a/modules/webadmin/skins/ice/Channel.tmpl b/modules/webadmin/skins/ice/Channel.tmpl deleted file mode 100644 index 2ccda26e..00000000 --- a/modules/webadmin/skins/ice/Channel.tmpl +++ /dev/null @@ -1,56 +0,0 @@ - - -
-
- - - -
Channel Info
-
-
-
-
Channel Name:
- - - - -
- -
- -
-
Buffer Count:
-
-
- -
-
Default Modes:
-
-
- -
- -
-
Save:
-
checked="checked" />
-
- -
-
Options:
- - checked="checked" disabled="disabled" /> - -
- -
-
-
-
- -
- -
-
- - - diff --git a/modules/webadmin/skins/ice/Error.tmpl b/modules/webadmin/skins/ice/Error.tmpl deleted file mode 100644 index 119093fe..00000000 --- a/modules/webadmin/skins/ice/Error.tmpl +++ /dev/null @@ -1,3 +0,0 @@ - -

- diff --git a/modules/webadmin/skins/ice/Footer.tmpl b/modules/webadmin/skins/ice/Footer.tmpl deleted file mode 100644 index 9eda7c1f..00000000 --- a/modules/webadmin/skins/ice/Footer.tmpl +++ /dev/null @@ -1,5 +0,0 @@ -
- - - - diff --git a/modules/webadmin/skins/ice/Header.tmpl b/modules/webadmin/skins/ice/Header.tmpl deleted file mode 100644 index 3cd8f72d..00000000 --- a/modules/webadmin/skins/ice/Header.tmpl +++ /dev/null @@ -1,32 +0,0 @@ - - - - - ZNC - <?VAR Title ESC=HTML?> - - - - -
- - -
- -
- -
diff --git a/modules/webadmin/skins/ice/ListUsers.tmpl b/modules/webadmin/skins/ice/ListUsers.tmpl deleted file mode 100644 index 4fbdcb2d..00000000 --- a/modules/webadmin/skins/ice/ListUsers.tmpl +++ /dev/null @@ -1,32 +0,0 @@ - - - There are no users defined. Click here if you would like to add one. - - - - - - - - - - - - - - - - - - - - - -
ActionUsernameClientsCurrent ServerIRC Nick
- - [Edit] - [Delete] - -
- - diff --git a/modules/webadmin/skins/ice/Main.tmpl b/modules/webadmin/skins/ice/Main.tmpl deleted file mode 100644 index 1c1c53f7..00000000 --- a/modules/webadmin/skins/ice/Main.tmpl +++ /dev/null @@ -1,3 +0,0 @@ - - Welcome to the ZNC webadmin module. - diff --git a/modules/webadmin/skins/ice/Settings.tmpl b/modules/webadmin/skins/ice/Settings.tmpl deleted file mode 100644 index e1471a22..00000000 --- a/modules/webadmin/skins/ice/Settings.tmpl +++ /dev/null @@ -1,112 +0,0 @@ - - -
-
- - -
Listen Port(s)
-
-
- - - - - - - - - - - - - - - - - -
PortBindHostSSLIPv6
TrueTrue
-
-
-
- -
-
Settings
-
-
-
-
Skin:
-
- -
-
-
- -
-
Status Prefix:
-
-
-
- -
-
ISpoofFile:
-
-
- -
-
ISpoofFormat:
-
-
-
- -
-
MOTD:
-
-
- -
-
VHosts:
-
-
-
-
-
-
- -
-
Global Modules
-
-
- - - - - - - - - - - - - - - -
NameArgumentsDescription
checked="checked" disabled="disabled" />
-
-
-
- -
- -
-
- - diff --git a/modules/webadmin/skins/ice/UserPage.tmpl b/modules/webadmin/skins/ice/UserPage.tmpl deleted file mode 100644 index 194aac53..00000000 --- a/modules/webadmin/skins/ice/UserPage.tmpl +++ /dev/null @@ -1,220 +0,0 @@ - - -
-
- - -
Authentication
-
-
-
-
Username:
-
- - - - - - -
- -
Password:
-
-
Confirm Password:
-
-
-
-
Allowed IPs:
- -
-
-
-
-
- -
-
IRC Information
-
-
-
-
Nick:
-
-
-
-
AltNick:
-
-
-
-
-
Ident:
-
-
-
-
StatusPrefix:
-
-
-
-
-
RealName:
-
-
- -
- -
VHost:
- - -
-
- -
-
QuitMsg:
-
-
-
- -
-
Servers:
-
-
-
-
-
-
- -
-
Modules
-
-
- - - - - - - - - - - - - - - - - -
NameArgumentsDescription
- checked="checked" disabled="disabled" /> - - -
-
-
-
- -
-
Channels
-
-
-
-
Default Modes:
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
[Add]SaveNameCurModesDefModesBufferCountOptions  <- Add a channel (opens in same page)  
- - [Edit] [Del] - checked="checked" />
- -
-
-
- -
-
ZNC Behavior
-
-
-
-
Playback Buffer Size:
-
-
-
-
Timestamp Format:
-
-
-
-
Timezone offset:
-
-
-
-
Join Tries:
-
-
-
-
Max Joins:
-
-
- -
- -
-
Options:
- - checked="checked" disabled="disabled" />   - -
- -
-
CTCP Replies:
-
-
-
-
-
-
- -
- -
-
- - diff --git a/modules/webadmin/skins/ice/data/favicon.ico b/modules/webadmin/skins/ice/data/favicon.ico deleted file mode 100644 index 5e28bcf0..00000000 Binary files a/modules/webadmin/skins/ice/data/favicon.ico and /dev/null differ diff --git a/modules/www/webadmin/settings.tmpl b/modules/www/webadmin/settings.tmpl index f0d6cc12..33741664 100644 --- a/modules/www/webadmin/settings.tmpl +++ b/modules/www/webadmin/settings.tmpl @@ -24,9 +24,9 @@
TrueFalseTrueFalseTrueFalseYesNoYesNoYesNo