Merge pull request #197 from crupest/front-dev

Front: Highlight and bookmark timeline and new home page.

4 files changed, 32 insertions, 10 deletions

diff --git a/FrontEnd/src/app/locales/en/admin.json b/FrontEnd/src/app/locales/en/admin.json
index 098ffb1f..ddb3ffad 100644
--- a/FrontEnd/src/app/locales/en/admin.json
+++ b/FrontEnd/src/app/locales/en/admin.json
@@ -1,7 +1,7 @@
 {

   "nav": {

     "users": "Users",

-    "highlightTimelines": "Highlight Timelines"

+    "more": "More"

   },

   "create": "Create",

   "user": {

diff --git a/FrontEnd/src/app/locales/en/translation.json b/FrontEnd/src/app/locales/en/translation.json
index cdb6da37..596b5217 100644
--- a/FrontEnd/src/app/locales/en/translation.json
+++ b/FrontEnd/src/app/locales/en/translation.json
@@ -1,6 +1,8 @@
 {
   "welcome": "Welcome!",
   "search": "Search",
+  "edit": "Edit",
+  "done": "Done",
   "loadFailReload": "Load failed, click <1>here</1> to reload.",
   "serviceWorker": {
     "availableOffline": "Timeline is now cached in your computer and you can use it offline. 🎉🎉🎉",
@@ -20,10 +22,17 @@
   "loadImageError": "Failed to load image.",
   "home": {
     "go": "Go!",
-    "allTimeline": "All Timelines",
-    "joinTimeline": "Joined Timelines",
-    "ownTimeline": "Owned Timelines",
+    "highlightTimeline": "Highlight Timelines",
+    "relatedTimeline": "Timelines Related To You",
+    "publicTimeline": "Public Timelines",
+    "bookmarkTimeline": "Bookmark Timelines",
     "offlinePrompt": "Oh oh, it seems you are offline. Here list some timelines cached locally. You can view them or click <1>here</1> to refresh.",
+    "message": {
+      "moveHighlightFail": "Failed to move highlight timeline.",
+      "deleteHighlightFail": "Failed to delete highlight timeline.",
+      "moveBookmarkFail": "Failed to move bookmark timeline.",
+      "deleteBookmarkFail": "Failed to delete bookmark timeline."
+    },
     "createButton": "Create Timeline",
     "createDialog": {
       "title": "Create Timeline!",
@@ -97,7 +106,9 @@
         "title": "Confirm Delete",
         "prompt": "Are you sure to delete the post? This operation is not recoverable."
       }
-    }
+    },
+    "addHighlightSuccess": "Succeeded to add highlight.",
+    "addBookmarkSuccess": "Succeeded to add bookmark."
   },
   "user": {
     "username": "username",
diff --git a/FrontEnd/src/app/locales/zh/admin.json b/FrontEnd/src/app/locales/zh/admin.json
index fed39b2d..edd1cabd 100644
--- a/FrontEnd/src/app/locales/zh/admin.json
+++ b/FrontEnd/src/app/locales/zh/admin.json
@@ -1,7 +1,7 @@
 {

   "nav": {

     "users": "用户",

-    "highlightTimelines": "高光时间线"

+    "more": "更多"

   },

   "create": "创建",

   "user": {

diff --git a/FrontEnd/src/app/locales/zh/translation.json b/FrontEnd/src/app/locales/zh/translation.json
index 5d28f694..e15e177e 100644
--- a/FrontEnd/src/app/locales/zh/translation.json
+++ b/FrontEnd/src/app/locales/zh/translation.json
@@ -1,6 +1,8 @@
 {
   "welcome": "欢迎！",
   "search": "搜索",
+  "edit": "编辑",
+  "done": "完成",
   "loadFailReload": "加载失败，<1>点击</1>重试。",
   "serviceWorker": {
     "availableOffline": "Timeline 已经缓存在本地，你可以离线使用它。🎉🎉🎉",
@@ -20,10 +22,17 @@
   "loadImageError": "加载图片失败",
   "home": {
     "go": "冲！",
-    "allTimeline": "所有的时间线",
-    "joinTimeline": "加入的时间线",
-    "ownTimeline": "拥有的时间线",
+    "highlightTimeline": "高光时间线",
+    "relatedTimeline": "关于你的时间线",
+    "publicTimeline": "公开时间线",
+    "bookmarkTimeline": "书签时间线",
     "offlinePrompt": "你好像处于离线状态。以下是一些缓存在本地的时间线。你可以查看它们或者<1>点击</1>重新获取在线信息。",
+    "message": {
+      "moveHighlightFail": "移动高光时间线失败。",
+      "deleteHighlightFail": "删除高光时间线失败。",
+      "moveBookmarkFail": "移动书签时间线失败。",
+      "deleteBookmarkFail": "删除书签时间线失败。"
+    },
     "createButton": "创建时间线",
     "createDialog": {
       "title": "创建时间线！",
@@ -97,7 +106,9 @@
         "title": "确认删除",
         "prompt": "确定删除这个消息？这个操作不可撤销。"
       }
-    }
+    },
+    "addHighlightSuccess": "成功添加高光。",
+    "addBookmarkSuccess": "成功添加书签。"
   },
   "user": {
     "username": "用户名",