summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWu Cheng-Han2015-07-06 13:51:55 +0800
committerWu Cheng-Han2015-07-06 13:51:55 +0800
commit04eef71b1164c31fd570c938d26dc1d7fd08ab9b (patch)
tree9c116fbe1681ab6dcf6f70e27a7f61dec32b7f36
parent85c67212ad5f5a0d5ceb9104d4ed22d8e8e54457 (diff)
Change note action "share" to "publish" to avoid misleading
Diffstat (limited to '')
-rw-r--r--app.js8
-rw-r--r--lib/response.js14
-rw-r--r--public/js/index.js4
-rw-r--r--public/views/header.ejs6
4 files changed, 16 insertions, 16 deletions
diff --git a/app.js b/app.js
index c2ff400d..8f84a021 100644
--- a/app.js
+++ b/app.js
@@ -352,10 +352,10 @@ app.post('/uploadimage', function (req, res) {
app.get("/new", response.newNote);
//get features
app.get("/features", response.showFeatures);
-//get share note
-app.get("/s/:shortid", response.showShareNote);
-//share note actions
-app.get("/s/:shortid/:action", response.shareNoteActions);
+//get publish note
+app.get("/s/:shortid", response.showPublishNote);
+//publish note actions
+app.get("/s/:shortid/:action", response.publishNoteActions);
//get note by id
app.get("/:noteId", response.showNote);
//note actions
diff --git a/lib/response.js b/lib/response.js
index d3b011bf..b8cfab17 100644
--- a/lib/response.js
+++ b/lib/response.js
@@ -33,9 +33,9 @@ var response = {
newNote: newNote,
showFeatures: showFeatures,
showNote: showNote,
- showShareNote: showShareNote,
+ showPublishNote: showPublishNote,
noteActions: noteActions,
- shareNoteActions: shareNoteActions
+ publishNoteActions: publishNoteActions
};
function responseError(res, code, detail, msg) {
@@ -139,7 +139,7 @@ function showNote(req, res, next) {
responseHackMD(res, noteId);
}
-function showShareNote(req, res, next) {
+function showPublishNote(req, res, next) {
var shortid = req.params.shortid;
if (shortId.isValid(shortid)) {
Note.findNote(shortid, function (err, note) {
@@ -194,7 +194,7 @@ function showShareNote(req, res, next) {
}
}
-function actionShare(req, res, noteId) {
+function actionPublish(req, res, noteId) {
db.readFromDB(noteId, function (err, data) {
if (err) {
responseError(res, "404", "Not Found", "oops.");
@@ -307,9 +307,9 @@ function noteActions(req, res, next) {
}
var action = req.params.action;
switch (action) {
- case "share":
+ case "publish":
case "pretty": //pretty deprecated
- actionShare(req, res, noteId);
+ actionPublish(req, res, noteId);
break;
case "download":
actionDownload(req, res, noteId);
@@ -326,7 +326,7 @@ function noteActions(req, res, next) {
}
}
-function shareNoteActions(req, res, next) {
+function publishNoteActions(req, res, next) {
var action = req.params.action;
switch (action) {
case "edit":
diff --git a/public/js/index.js b/public/js/index.js
index bf3a3ab2..43b02ad5 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -234,7 +234,7 @@ var ui = {
shortStatus: $(".ui-short-status"),
status: $(".ui-status"),
new: $(".ui-new"),
- share: $(".ui-share"),
+ publish: $(".ui-publish"),
download: {
markdown: $(".ui-download-markdown")
},
@@ -618,7 +618,7 @@ function changeMode(type) {
//button actions
var url = window.location.pathname;
//share
-ui.toolbar.share.attr("href", url + "/share");
+ui.toolbar.publish.attr("href", url + "/publish");
//download
//markdown
ui.toolbar.download.markdown.click(function () {
diff --git a/public/views/header.ejs b/public/views/header.ejs
index 7aee5351..d1872977 100644
--- a/public/views/header.ejs
+++ b/public/views/header.ejs
@@ -24,7 +24,7 @@
<ul class="dropdown-menu" role="menu" aria-labelledby="menu">
<li role="presentation"><a role="menuitem" class="ui-new" tabindex="-1" href="./new" target="_blank"><i class="fa fa-plus fa-fw"></i> New</a>
</li>
- <li role="presentation"><a role="menuitem" class="ui-share" tabindex="-1" href="#" target="_blank"><i class="fa fa-share-alt fa-fw"></i> Share</a>
+ <li role="presentation"><a role="menuitem" class="ui-publish" tabindex="-1" href="#" target="_blank"><i class="fa fa-print fa-fw"></i> Publish</a>
</li>
<li class="divider"></li>
<li class="dropdown-header">Save</li>
@@ -85,8 +85,8 @@
</a>
</li>
<li>
- <a href="#" target="_blank" class="ui-share">
- <i class="fa fa-share-alt"></i> Share
+ <a href="#" target="_blank" class="ui-publish">
+ <i class="fa fa-print"></i> Publish
</a>
</li>
<li>