mirror of
https://github.com/thelounge/thelounge.git
synced 2024-05-17 13:46:36 +02:00
Split users by mode in the sidebar
This commit is contained in:
Mattias Erming
parent
b801689eaa
commit
eae1e661b7
|
|
@ -670,7 +670,7 @@ button {
|
|||
overflow: auto;
|
||||
overflow-x: hidden;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
padding: 12px 16px;
|
||||
padding-bottom: 10px;
|
||||
position: absolute;
|
||||
top: 48px;
|
||||
width: 100%;
|
||||
|
|
@ -678,10 +678,34 @@ button {
|
|||
#chat .names button {
|
||||
display: block;
|
||||
line-height: 1.6;
|
||||
padding: 0 16px;
|
||||
}
|
||||
#chat .names .inner {
|
||||
width: 300px;
|
||||
}
|
||||
#chat .user-mode:before {
|
||||
content: "";
|
||||
border-bottom: 1px solid #eee;
|
||||
display: block;
|
||||
line-height: 1.6;
|
||||
padding: 12px 16px 10px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
#chat .user-mode.owner:before {
|
||||
content: "Owners";
|
||||
}
|
||||
#chat .user-mode.admin:before {
|
||||
content: "Administrators";
|
||||
}
|
||||
#chat .user-mode.op:before {
|
||||
content: "Operators";
|
||||
}
|
||||
#chat .user-mode.voice:before {
|
||||
content: "Voiced";
|
||||
}
|
||||
#chat .user-mode.normal:before {
|
||||
content: "Users";
|
||||
}
|
||||
#sign-in label {
|
||||
display: block;
|
||||
margin-top: 10px;
|
||||
|
|
|
|||
4
client/js/libs.min.js
vendored
4
client/js/libs.min.js
vendored
File diff suppressed because one or more lines are too long
12
client/js/libs/handlebars/diff.js
Normal file
12
client/js/libs/handlebars/diff.js
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
var diff;
|
||||
|
||||
Handlebars.registerHelper(
|
||||
"diff", function(a, opt) {
|
||||
if (a != diff) {
|
||||
diff = a;
|
||||
return opt.fn(this);
|
||||
} else {
|
||||
return opt.inverse(this);
|
||||
}
|
||||
}
|
||||
);
|
||||
13
client/js/libs/handlebars/modes.js
Normal file
13
client/js/libs/handlebars/modes.js
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
Handlebars.registerHelper(
|
||||
"modes", function(mode) {
|
||||
var modes = {
|
||||
"~": "owner",
|
||||
"&": "admin",
|
||||
"@": "op",
|
||||
"%": "half-op",
|
||||
"+": "voice",
|
||||
"" : "normal"
|
||||
};
|
||||
return modes[mode];
|
||||
}
|
||||
);
|
||||
|
|
@ -727,6 +727,8 @@ $(function() {
|
|||
}
|
||||
|
||||
function refresh() {
|
||||
console.log("REF");
|
||||
return;
|
||||
window.onbeforeunload = null;
|
||||
location.reload();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -165,20 +165,36 @@ templates['user'] = template({"1":function(depth0,helpers,partials,data) {
|
|||
+ escapeExpression(((helpers.users || (depth0 && depth0.users) || helperMissing).call(depth0, ((stack1 = (depth0 != null ? depth0.users : depth0)) != null ? stack1.length : stack1), {"name":"users","hash":{},"data":data})))
|
||||
+ "\">\n</div>\n";
|
||||
},"3":function(depth0,helpers,partials,data) {
|
||||
var helper, helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, functionType="function";
|
||||
return " <button class=\"user\" style=\"color: #"
|
||||
return "";
|
||||
},"5":function(depth0,helpers,partials,data) {
|
||||
var stack1, helper, helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, functionType="function", buffer = "";
|
||||
stack1 = ((helpers.diff || (depth0 && depth0.diff) || helperMissing).call(depth0, (depth0 != null ? depth0.mode : depth0), {"name":"diff","hash":{},"fn":this.program(6, data),"inverse":this.noop,"data":data}));
|
||||
if (stack1 != null) { buffer += stack1; }
|
||||
return buffer + " <button class=\"user\" style=\"color: #"
|
||||
+ escapeExpression(((helpers.stringcolor || (depth0 && depth0.stringcolor) || helperMissing).call(depth0, (depth0 != null ? depth0.name : depth0), {"name":"stringcolor","hash":{},"data":data})))
|
||||
+ "\">"
|
||||
+ escapeExpression(((helper = (helper = helpers.mode || (depth0 != null ? depth0.mode : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"mode","hash":{},"data":data}) : helper)))
|
||||
+ escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
|
||||
+ "</button>\n";
|
||||
},"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
|
||||
var stack1, buffer = "";
|
||||
},"6":function(depth0,helpers,partials,data) {
|
||||
var stack1, helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "";
|
||||
stack1 = helpers.unless.call(depth0, (data && data.first), {"name":"unless","hash":{},"fn":this.program(7, data),"inverse":this.noop,"data":data});
|
||||
if (stack1 != null) { buffer += stack1; }
|
||||
return buffer + " <div class=\"user-mode "
|
||||
+ escapeExpression(((helpers.modes || (depth0 && depth0.modes) || helperMissing).call(depth0, (depth0 != null ? depth0.mode : depth0), {"name":"modes","hash":{},"data":data})))
|
||||
+ "\">\n";
|
||||
},"7":function(depth0,helpers,partials,data) {
|
||||
return " </div>\n";
|
||||
},"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
|
||||
var stack1, helperMissing=helpers.helperMissing, buffer = "";
|
||||
stack1 = helpers['if'].call(depth0, ((stack1 = (depth0 != null ? depth0.users : depth0)) != null ? stack1.length : stack1), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.noop,"data":data});
|
||||
if (stack1 != null) { buffer += stack1; }
|
||||
buffer += "<div class=\"names\">\n <div class=\"inner\">\n";
|
||||
stack1 = helpers.each.call(depth0, (depth0 != null ? depth0.users : depth0), {"name":"each","hash":{},"fn":this.program(3, data),"inverse":this.noop,"data":data});
|
||||
buffer += "<div class=\"names\">\n <div class=\"inner\">\n ";
|
||||
stack1 = ((helpers.diff || (depth0 && depth0.diff) || helperMissing).call(depth0, "reset", {"name":"diff","hash":{},"fn":this.program(3, data),"inverse":this.noop,"data":data}));
|
||||
if (stack1 != null) { buffer += stack1; }
|
||||
return buffer + " </div>\n</div>\n";
|
||||
buffer += "\n";
|
||||
stack1 = helpers.each.call(depth0, (depth0 != null ? depth0.users : depth0), {"name":"each","hash":{},"fn":this.program(5, data),"inverse":this.noop,"data":data});
|
||||
if (stack1 != null) { buffer += stack1; }
|
||||
return buffer + " </div>\n </div>\n</div>\n";
|
||||
},"useData":true});
|
||||
})();
|
||||
|
|
@ -5,8 +5,16 @@
|
|||
{{/if}}
|
||||
<div class="names">
|
||||
<div class="inner">
|
||||
{{#diff "reset"}}{{/diff}}
|
||||
{{#each users}}
|
||||
<button class="user" style="color: #{{stringcolor name}}">{{mode}}{{name}}</button>
|
||||
{{#diff mode}}
|
||||
{{#unless @first}}
|
||||
</div>
|
||||
{{/unless}}
|
||||
<div class="user-mode {{modes mode}}">
|
||||
{{/diff}}
|
||||
<button class="user" style="color: #{{stringcolor name}}">{{mode}}{{name}}</button>
|
||||
{{/each}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
"mkdirp": "^0.5.0",
|
||||
"moment": "~2.7.0",
|
||||
"read": "^1.0.5",
|
||||
"slate-irc": "~0.7.0",
|
||||
"slate-irc": "~0.7.2",
|
||||
"socket.io": "~1.0.6",
|
||||
"superagent": "^0.18.2"
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in a new issue