diff --git a/modules/extra/webcpanel/pages/operserv/akill.cpp b/modules/extra/webcpanel/pages/operserv/akill.cpp index 696dca69a..bc8ef7ee6 100644 --- a/modules/extra/webcpanel/pages/operserv/akill.cpp +++ b/modules/extra/webcpanel/pages/operserv/akill.cpp @@ -23,7 +23,7 @@ bool WebCPanel::OperServ::Akill::OnRequest(HTTPProvider *server, const Anope::st else { if (akills->GetCount() == 0) - replacements["MESSAGES"] = "No Akills to display."; + replacements["AKILLS"] = "No Akills to display."; if (message.post_data.count("mask") > 0 && message.post_data.count("expiry") > 0 && message.post_data.count("reason") > 0) { diff --git a/modules/extra/webcpanel/templates/default/chanserv/access.html b/modules/extra/webcpanel/templates/default/chanserv/access.html index e9c42c61b..5b02c068a 100644 --- a/modules/extra/webcpanel/templates/default/chanserv/access.html +++ b/modules/extra/webcpanel/templates/default/chanserv/access.html @@ -1,12 +1,13 @@ {INCLUDE header.html} - {FOR M IN MESSAGES} -
- {M}
-
- {END FOR} +
Access List
+
+ {FOR M IN MESSAGES} +
+ {M}
+
+ {END FOR} -

Access List

- {IF EXISTS ACCESSES} + {IF EXISTS ACCESSES} @@ -29,41 +30,41 @@ {END FOR}
- {ELSE} + {ELSE} Access list is empty. - {END IF} + {END IF} -
+
-

Add an access entry

-
-
- -
- +

Add an access entry

+ +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
-
- +
+
+ +
-
- - + +
{INCLUDE footer.html} diff --git a/modules/extra/webcpanel/templates/default/chanserv/akick.html b/modules/extra/webcpanel/templates/default/chanserv/akick.html index 819a69096..3b6a2f190 100644 --- a/modules/extra/webcpanel/templates/default/chanserv/akick.html +++ b/modules/extra/webcpanel/templates/default/chanserv/akick.html @@ -1,12 +1,13 @@ {INCLUDE header.html} - {FOR M IN MESSAGES} -
- {M}
-
- {END FOR} +
Akick List
+
+ {FOR M IN MESSAGES} +
+ {M}
+
+ {END FOR} -

Akick List

- {IF EXISTS MASKS} + {IF EXISTS MASKS} @@ -27,32 +28,31 @@ {END FOR}
- {ELSE} + {ELSE} Akick list is empty. - {END IF} + {END IF} -
+
-

Add an akick entry

-
-
- -
- +

Add an akick entry

+ +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
-
- +
+
+ +
-
- - - + +
{INCLUDE footer.html} diff --git a/modules/extra/webcpanel/templates/default/chanserv/drop.html b/modules/extra/webcpanel/templates/default/chanserv/drop.html index 7852bfde6..81db73167 100644 --- a/modules/extra/webcpanel/templates/default/chanserv/drop.html +++ b/modules/extra/webcpanel/templates/default/chanserv/drop.html @@ -1,34 +1,36 @@ {INCLUDE header.html} - {FOR M IN MESSAGES} -
- {M}
-
- {END FOR} - -

Channels you can drop

-
- {FOR CH,ECH IN CHANNEL_NAMES,ESCAPED_CHANNEL_NAMES} - {CH}
- {END FOR} -
- {IF EXISTS CHANNEL_DROP} -
-

Drop Channel {CHANNEL_DROP}?

-
- - -
- -
- -
-
-
-
- -
-
-
+
Channels you can drop
+
+ {FOR M IN MESSAGES} +
+ {M}
- {END IF} + {END FOR} + +
+ {FOR CH,ECH IN CHANNEL_NAMES,ESCAPED_CHANNEL_NAMES} + {CH}
+ {END FOR} +
+ {IF EXISTS CHANNEL_DROP} +
+

Drop Channel {CHANNEL_DROP}?

+
+ + +
+ +
+ +
+
+
+
+ +
+
+
+
+ {END IF} +
{INCLUDE footer.html} \ No newline at end of file diff --git a/modules/extra/webcpanel/templates/default/chanserv/main.html b/modules/extra/webcpanel/templates/default/chanserv/main.html index 43eb902fb..8b88970e8 100644 --- a/modules/extra/webcpanel/templates/default/chanserv/main.html +++ b/modules/extra/webcpanel/templates/default/chanserv/main.html @@ -1,8 +1,17 @@ {INCLUDE header.html} -

Channels you have access in

-
- {FOR CH,ECH IN CHANNEL_NAMES,ESCAPED_CHANNEL_NAMES} - {CH}
- {END FOR} +
Channels you have access in
+
+ {IF EXISTS CHANNEL_NAMES} +
+

Choose a channel to access it's Settings, Access or Akick pages.

+
    + {FOR CH,ECH IN CHANNEL_NAMES,ESCAPED_CHANNEL_NAMES} +
  • {CH}
    • + {END FOR} +
+ {ELSE} + You don't have access in any channel
+ {END IF} +
{INCLUDE footer.html} diff --git a/modules/extra/webcpanel/templates/default/chanserv/set.html b/modules/extra/webcpanel/templates/default/chanserv/set.html index dff390e09..0c2596dc6 100644 --- a/modules/extra/webcpanel/templates/default/chanserv/set.html +++ b/modules/extra/webcpanel/templates/default/chanserv/set.html @@ -1,76 +1,81 @@ {INCLUDE header.html} - {FOR M IN MESSAGES} -
- {M}
-
- {END FOR} +
Channel Information
+
+ {FOR M IN MESSAGES} +
+ {M}
+
+ {END FOR} -

Channel Information

-
- - - - - - {IF EXISTS FOUNDER} - - - - - {END IF} - {IF EXISTS SUCCESSOR} - - - - - {END IF} - - - - - - - - - {IF EXISTS LAST_TOPIC} - - - - - - - - - {END IF} - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Channel Name{CHANNEL}
Founder{FOUNDER}
Succsesor{SUCCESSOR}
Time registered{TIME_REGISTERED}
Last used{LAST_USED}
Last topic{LAST_TOPIC}
Set by{LAST_TOPIC_SETTER}
Keep topic
Peace
Private
Restricted
Secure
Secure Ops
Topic Lock
- -
+
+ + + + + + {IF EXISTS FOUNDER} + + + + + {END IF} + {IF EXISTS SUCCESSOR} + + + + + {END IF} + + + + + + + + + {IF EXISTS LAST_TOPIC} + + + + + + + + + {END IF} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Channel Name{CHANNEL}
Founder{FOUNDER}
Succsesor{SUCCESSOR}
Time registered{TIME_REGISTERED}
Last used{LAST_USED}
Last topic{LAST_TOPIC}
Set by{LAST_TOPIC_SETTER}
Keep topic
Peace
Private
Restricted
Secure
Secure Ops
Topic Lock
+
+
{INCLUDE footer.html} diff --git a/modules/extra/webcpanel/templates/default/footer.html b/modules/extra/webcpanel/templates/default/footer.html index 6d224f8df..257f04288 100644 --- a/modules/extra/webcpanel/templates/default/footer.html +++ b/modules/extra/webcpanel/templates/default/footer.html @@ -2,7 +2,7 @@
-
+
Anope IRC Services - © 2013 Anope Team - http://anope.org
diff --git a/modules/extra/webcpanel/templates/default/header.html b/modules/extra/webcpanel/templates/default/header.html index a5fe89517..613ed617a 100644 --- a/modules/extra/webcpanel/templates/default/header.html +++ b/modules/extra/webcpanel/templates/default/header.html @@ -27,11 +27,18 @@ Anope Web Control Panel - Logged in as {ACCOUNT} (Logout) + Logged in as {ACCOUNT} (Logout)
@@ -50,4 +57,4 @@
-
+
\ No newline at end of file diff --git a/modules/extra/webcpanel/templates/default/hostserv/request.html b/modules/extra/webcpanel/templates/default/hostserv/request.html index 3b2b30c7d..f557244d1 100644 --- a/modules/extra/webcpanel/templates/default/hostserv/request.html +++ b/modules/extra/webcpanel/templates/default/hostserv/request.html @@ -1,43 +1,45 @@ {INCLUDE header.html} - {FOR M IN MESSAGES} -
- {M}
-
- {END FOR} +
vHost Information
+
+ {FOR M IN MESSAGES} +
+ {M}
+
+ {END FOR} -

vHost Information

- - - - - - - - {IF EXISTS CAN_REQUEST} - - + + + {IF EXISTS CAN_REQUEST} + + + + + + + + {ELSE} + + + + {END IF} + +
Your current vHost: - {IF EXISTS VHOST} - {VHOST} - {ELSE} - None - {END IF} -
+ + + + + - - - - - - {ELSE} - - - - {END IF} - -
Your current vHost: {IF EXISTS VHOST} - Request a new vHost + {VHOST} {ELSE} - Request a vHost + None {END IF} -
vHost requests are disabled on this network.
+
+ {IF EXISTS VHOST} + Request a new vHost + {ELSE} + Request a vHost + {END IF} +
vHost requests are disabled on this network.
+
{INCLUDE footer.html} diff --git a/modules/extra/webcpanel/templates/default/memoserv/memos.html b/modules/extra/webcpanel/templates/default/memoserv/memos.html index dc82846c6..b3b54d948 100644 --- a/modules/extra/webcpanel/templates/default/memoserv/memos.html +++ b/modules/extra/webcpanel/templates/default/memoserv/memos.html @@ -1,103 +1,112 @@ {INCLUDE header.html} - {FOR M IN MESSAGES} -
- {M}
-
- {END FOR} +
Memos List
+
+ {FOR M IN MESSAGES} +
+ {M}
+
+ {END FOR} - {IF EXISTS NUMBER} - + - + -

Memos List

- - - - - - - - - {FOR I,S,T,TXT,U IN NUMBER,SENDER,TIME,TEXT,UNREAD} - {IF EQ U YES} - - {ELSE} - - {END IF} - - - - + + + + + {END FOR} + +
NumberSenderMessage (hover: Time)
{I}{S}{TXT} + + + + + + + + + {FOR I,S,T,TXT,U IN NUMBER,SENDER,TIME,TEXT,UNREAD} {IF EQ U YES} - Reply - Mark as Read - Delete + {ELSE} - Reply - Mark as Unread - Delete + {END IF} - - - {END FOR} - -
NumberSenderMessage (hover: Time)
- {ELSE} - No memos to show. - {END IF} + 		{I}{S}{TXT} + {IF EQ U YES} + Reply + Mark as Read + Delete + {ELSE} + Reply + Mark as Unread + Delete + {END IF} +
+ {ELSE} + No memos to show. + {END IF} -
+
-
-
-

Memos for channel

-
    - {FOR CH,ECH IN CHANNEL_NAMES,ESCAPED_CHANNEL_NAMES} -
  • {CH}
    • - {END FOR} -
+
+
+

Memos for channel

+ {IF EXISTS CHANNEL_NAMES} +
+
    + {FOR CH,ECH IN CHANNEL_NAMES,ESCAPED_CHANNEL_NAMES} +
  • {CH}
    • + {END FOR} +
+
+ {ELSE} + You don't have access in any channel
+ {END IF} + +
+
+

Send a new Memo

+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+
+
-
-

Send a new Memo

-
-
- -
- -
-
-
- -
- -
-
-
-
- -
-
-
-
-
- {IF EXISTS CMDR} -
- {CMDR} + {IF EXISTS CMDR} +
+ {CMDR} +
+ {END IF}
- {END IF} {INCLUDE footer.html} diff --git a/modules/extra/webcpanel/templates/default/nickserv/access.html b/modules/extra/webcpanel/templates/default/nickserv/access.html index 89a867627..c5397a4a0 100644 --- a/modules/extra/webcpanel/templates/default/nickserv/access.html +++ b/modules/extra/webcpanel/templates/default/nickserv/access.html @@ -1,12 +1,13 @@ {INCLUDE header.html} - {FOR M IN MESSAGES} -
- {M}
-
- {END FOR} +
Nick access list
+
+ {FOR M IN MESSAGES} +
+ {M}
+
+ {END FOR} - {IF EXISTS ACCESS} -

Nick access list

+ {IF EXISTS ACCESS} {FOR A IN ACCESS} @@ -17,24 +18,25 @@ {END FOR}
- {ELSE} - Your access list is empty. - {END IF} + {ELSE} + Your access list is empty. + {END IF} -
+
-

Add an access entry

-
-
- -
- +

Add an access entry

+ +
+ +
+ +
-
-
-
- +
+
+ +
-
- + +
{INCLUDE footer.html} diff --git a/modules/extra/webcpanel/templates/default/nickserv/alist.html b/modules/extra/webcpanel/templates/default/nickserv/alist.html index 224f09894..f3b2e0124 100644 --- a/modules/extra/webcpanel/templates/default/nickserv/alist.html +++ b/modules/extra/webcpanel/templates/default/nickserv/alist.html @@ -1,21 +1,23 @@ {INCLUDE header.html} -

Channel access list

- - - - - - - - - - {FOR N,C,A IN NUMBERS,CHANNELS,ACCESSES} +
Channel access list
+
+
NumberChannelAccess
+ - - - + + + - {END FOR} - -
{N}{C}{A}NumberChannelAccess
+ + + {FOR N,C,A IN NUMBERS,CHANNELS,ACCESSES} + + {N} + {C} + {A} + + {END FOR} + + +
{INCLUDE footer.html} diff --git a/modules/extra/webcpanel/templates/default/nickserv/cert.html b/modules/extra/webcpanel/templates/default/nickserv/cert.html index 636626e2a..88c564d43 100644 --- a/modules/extra/webcpanel/templates/default/nickserv/cert.html +++ b/modules/extra/webcpanel/templates/default/nickserv/cert.html @@ -1,36 +1,38 @@ {INCLUDE header.html} - {FOR M IN MESSAGES} -
- {M}
-
- {END FOR} - - Your certificate finrgerprints - - - {FOR CERT IN CERTS} - - - - +
Your certificate finrgerprints
+
+ {FOR M IN MESSAGES} +
+ {M}
+
{END FOR} -
-
{CERT}Delete
-
+ + + {FOR CERT IN CERTS} + + + + + {END FOR} + +
{CERT}Delete
-

Add an certificate fingerprint

-
-
- -
- +
+ +

Add an certificate fingerprint

+ +
+ +
+ +
-
-
-
- +
+
+ +
-
- + +
{INCLUDE footer.html} diff --git a/modules/extra/webcpanel/templates/default/nickserv/info.html b/modules/extra/webcpanel/templates/default/nickserv/info.html index 22addbf4f..667c8b370 100644 --- a/modules/extra/webcpanel/templates/default/nickserv/info.html +++ b/modules/extra/webcpanel/templates/default/nickserv/info.html @@ -1,74 +1,72 @@ {INCLUDE header.html} - {IF EXISTS ERRORS} +
Your account information
+
{FOR M IN ERRORS}
{M}
{END FOR} - {END IF} - {IF EXISTS MESSAGES} -
{FOR M IN MESSAGES} +
{M}
- {END FOR} -
- {END IF} - -

Your account information:

-
- - - - - - - {IF EXISTS EMAIL} - - - - - {END IF} - - - - - {IF EXISTS VHOST} - - - - - {END IF} - - - - - - - - - - - - - - - - - - - - - -
Account:{DISPLAY}
E-mail:{EMAIL}
Time registered:{TIME_REGISTERED}
Vhost:{VHOST}
Greet:
Auto op:
Private:
Secure:
Kill: - -
-
-
-
+ {END FOR} + +
+ + + + + + + {IF EXISTS EMAIL} + + + + + {END IF} + + + + + {IF EXISTS VHOST} + + + + + {END IF} + + + + + + + + + + + + + + + + + + + + + +
Account:{DISPLAY}
E-mail:{EMAIL}
Time registered:{TIME_REGISTERED}
Vhost:{VHOST}
Greet:
Auto op:
Private:
Secure:
Kill: + +
+
+ +
+
+
{INCLUDE footer.html} diff --git a/modules/extra/webcpanel/templates/default/operserv/akill.html b/modules/extra/webcpanel/templates/default/operserv/akill.html index 5c25c26da..9b269a7c0 100644 --- a/modules/extra/webcpanel/templates/default/operserv/akill.html +++ b/modules/extra/webcpanel/templates/default/operserv/akill.html @@ -1,71 +1,77 @@ {INCLUDE header.html} - {IF EXISTS NOACCESS} -

Access denied.

- {ELSE} +
Akill List
+
+ {IF EXISTS NOACCESS} +

Access denied.

+ {ELSE} - {FOR M IN MESSAGES} -
- {M}
+ {FOR M IN MESSAGES} +
+ {M}
+
+ {END FOR} + + + + {IF EXISTS AKILLS} + {AKILLS} + {ELSE} + + + + + + + + + + + + {FOR N,H,S,T,E,R IN NUMBER,HOST,SETTER,TIME,EXPIRE,REASON} + + + + + + + + {END FOR} + +
NumberHostmask (hover: Reason)Expires (hover: Set Date)Setter
{N}{H}{E}{S}Delete
+ {END IF} + +
+ +

Add a new Akill

+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+
+ {END IF}
- {END FOR} - - - -

AKILL List

- - - - - - - - - - - - {FOR N,H,S,T,E,R IN NUMBER,HOST,SETTER,TIME,EXPIRE,REASON} - - - - - - - - {END FOR} - -
NumberHostmask (hover: Reason)Expires (hover: Set Date)Setter
{N}{H}{E}{S}Delete
- -
- -

Add a new AKILL

-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- -
-
-
- {END IF} {INCLUDE footer.html} diff --git a/modules/extra/webcpanel/templates/default/style.css b/modules/extra/webcpanel/templates/default/style.css index 117cc1ecc..7c7ba533a 100644 --- a/modules/extra/webcpanel/templates/default/style.css +++ b/modules/extra/webcpanel/templates/default/style.css @@ -25,6 +25,19 @@ h4 { box-shadow: 0 1px 10px rgba(0, 0, 0, 0.8); } +.label { + font-size: 13px; + font-weight: normal; +} + +.label-info { + background-color: #4EA4EE; +} + +.label-info[href]:hover, .label-info[href]:focus { + background-color: #428BCA; +} + /* LOGIN FORM */ .form-signin .form-signin-heading, .form-signin .checkbox { margin-bottom: 10px; @@ -50,6 +63,9 @@ h4 { } /* Control Panel */ +.panel-default .panel-heading { + font-size: 24px; +} #loggedIn { margin: 15px 15px 0 0; } @@ -69,6 +85,7 @@ h4 { font-weight: bold; padding-right: 10px; text-align: right; + width: 25%; } #tableInfoNorm td { @@ -105,6 +122,10 @@ h4 { font-weight: normal; } +#channelList li { + margin-top: 10px; +} + /* NAVBAR */ .navbar, .well { background-color: white; @@ -116,12 +137,23 @@ h4 { box-shadow: 0 8px 6px -8px black; } -.navbar-default .navbar-nav > li > a { - color: #777777; +.navbar-default .nav { + margin-bottom: -1px; } -.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus { - color: #333333; - border-bottom: 3px solid #0082D9; - margin-bottom: -3px; +.navbar-default .nav > li > a { + color: #428BCA; +} + +.navbar-default .nav > li > a:hover, .navbar-default .nav > li > a:focus { + color: #428BCA; + border-top: 3px solid #0082D9; + margin-top: -3px; +} + +.navbar-default .nav > li.active > a, .navbar-default .nav > li.active > a:hover, .navbar-default .nav > li.active > a:focus { + color: #428BCA; + background-color: transparent; + background-color: rgba(66, 139, 202, 0.1); + border-bottom-color: transparent; } diff --git a/modules/extra/webcpanel/webcpanel.h b/modules/extra/webcpanel/webcpanel.h index 638a7c1c9..e74b6c952 100644 --- a/modules/extra/webcpanel/webcpanel.h +++ b/modules/extra/webcpanel/webcpanel.h @@ -97,6 +97,8 @@ class WebPanelProtectedPage : public WebPanelPage replacements["TITLE"] = page_title; replacements["ACCOUNT"] = na->nc->display; + replacements["PAGE_NAME"] = page_name; + replacements["CATEGORY"] = category; Anope::string sections, get;