depau/HackMD
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix permission order and keep wording consistency

Browse source
This commit is contained in:
Wu Cheng-Han 2017-01-12 19:04:17 +08:00
parent 7e191acbde
commit 5f65795e79
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/models/note.js
View file

@ -23,7 +23,7 @@ var logger = require("../logger.js");
var ot = require("../ot/index.js"); var ot = require("../ot/index.js");
// permission types // permission types
var permissionTypes = ["freely", "editable", "limited", "private", "protected", "locked"]; var permissionTypes = ["freely", "editable", "limited", "locked", "protected", "private"];
module.exports = function (sequelize, DataTypes) { module.exports = function (sequelize, DataTypes) {
var Note = sequelize.define("Note", { var Note = sequelize.define("Note", {

12
public/js/index.js
View file

@ -2291,17 +2291,17 @@ function updatePermission(newPermission) {
label = '<i class="fa fa-id-card"></i> Limited'; label = '<i class="fa fa-id-card"></i> Limited';
title = "Signed people can edit & guest can't view" title = "Signed people can edit & guest can't view"
break; break;
case "private": case "locked":
label = '<i class="fa fa-hand-stop-o"></i> Private'; label = '<i class="fa fa-lock"></i> Locked';
title = "Only owner can view & edit"; title = "Only owner can edit";
break; break;
case "protected": case "protected":
label = '<i class="fa fa-umbrella"></i> Protected'; label = '<i class="fa fa-umbrella"></i> Protected';
title = "Only owner can edit & guest can't view"; title = "Only owner can edit & guest can't view";
break; break;
case "locked": case "private":
label = '<i class="fa fa-lock"></i> Locked'; label = '<i class="fa fa-hand-stop-o"></i> Private';
title = "Only owner can edit"; title = "Only owner can view & edit";
break; break;
} }
if (personalInfo.userid && owner && personalInfo.userid == owner) { if (personalInfo.userid && owner && personalInfo.userid == owner) {

6
public/views/body.ejs
View file

@ -17,10 +17,10 @@
<ul class="dropdown-menu" aria-labelledby="permissionLabel"> <ul class="dropdown-menu" aria-labelledby="permissionLabel">
<li class="ui-permission-freely"<% if(!allowAnonymous) { %> style="display: none;"<% } %>><a><i class="fa fa-leaf fa-fw"></i> Freely - Anyone can edit</a></li> <li class="ui-permission-freely"<% if(!allowAnonymous) { %> style="display: none;"<% } %>><a><i class="fa fa-leaf fa-fw"></i> Freely - Anyone can edit</a></li>
<li class="ui-permission-editable"><a><i class="fa fa-shield fa-fw"></i> Editable - Signed people can edit</a></li> <li class="ui-permission-editable"><a><i class="fa fa-shield fa-fw"></i> Editable - Signed people can edit</a></li>
<li class="ui-permission-limited"><a><i class="fa fa-id-card fa-fw"></i> Limited - Signed people can edit &amp; view</a></li> <li class="ui-permission-limited"><a><i class="fa fa-id-card fa-fw"></i> Limited - Signed people can edit &amp; guest can't view</a></li>
<li class="ui-permission-private"><a><i class="fa fa-hand-stop-o fa-fw"></i> Private - Only owner can view &amp; edit</a></li>
<li class="ui-permission-protected"><a><i class="fa fa-umbrella fa-fw"></i> Protected - Only owner can edit</a></li>
<li class="ui-permission-locked"><a><i class="fa fa-lock fa-fw"></i> Locked - Only owner can edit</a></li> <li class="ui-permission-locked"><a><i class="fa fa-lock fa-fw"></i> Locked - Only owner can edit</a></li>
<li class="ui-permission-protected"><a><i class="fa fa-umbrella fa-fw"></i> Protected - Only owner can edit &amp; guest can't view</a></li>
<li class="ui-permission-private"><a><i class="fa fa-hand-stop-o fa-fw"></i> Private - Only owner can view &amp; edit</a></li>
<li class="divider"></li> <li class="divider"></li>
<li class="ui-delete-note"><a><i class="fa fa-trash-o fa-fw"></i> Delete this note</a></li> <li class="ui-delete-note"><a><i class="fa fa-trash-o fa-fw"></i> Delete this note</a></li>
</ul> </ul>