From c54de7159c266657cad115aaa79061e0ede2c146 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Mon, 20 Jul 2015 17:40:22 +0530
Subject: [PATCH] UX: more permalinks page improvements

---
 .../javascripts/admin/templates/permalinks.hbs     |  6 +++---
 .../admin/templates/permalinks_list_item.hbs       | 14 ++++++--------
 .../stylesheets/common/admin/admin_base.scss       | 12 ++++++------
 app/serializers/permalink_serializer.rb            | 10 +++++++++-
 config/locales/client.en.yml                       |  3 +++
 5 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/permalinks.hbs b/app/assets/javascripts/admin/templates/permalinks.hbs
index 47717627b6a..7d6e1ff8fc0 100644
--- a/app/assets/javascripts/admin/templates/permalinks.hbs
+++ b/app/assets/javascripts/admin/templates/permalinks.hbs
@@ -10,9 +10,9 @@
     <div class='table admin-logs-table permalinks'>
       <div class="heading-container">
         <div class="col heading first url">{{i18n 'admin.permalink.url'}}</div>
-        <div class="col heading topic_id">{{i18n 'admin.permalink.topic_id'}}</div>
-        <div class="col heading post_id">{{i18n 'admin.permalink.post_id'}}</div>
-        <div class="col heading category_id">{{i18n 'admin.permalink.category_id'}}</div>
+        <div class="col heading topic">{{i18n 'admin.permalink.topic_title'}}</div>
+        <div class="col heading post">{{i18n 'admin.permalink.post_title'}}</div>
+        <div class="col heading category">{{i18n 'admin.permalink.category_title'}}</div>
         <div class="col heading external_url">{{i18n 'admin.permalink.external_url'}}</div>
         <div class="col heading actions"></div>
         <div class="clearfix"></div>
diff --git a/app/assets/javascripts/admin/templates/permalinks_list_item.hbs b/app/assets/javascripts/admin/templates/permalinks_list_item.hbs
index 63d7ed839f1..2a143e07ed7 100644
--- a/app/assets/javascripts/admin/templates/permalinks_list_item.hbs
+++ b/app/assets/javascripts/admin/templates/permalinks_list_item.hbs
@@ -1,19 +1,17 @@
 <div class="col first url">{{url}}</div>
-<div class="col topic_id">
+<div class="col topic">
   {{#if topic_id}}
-    {{topic_id}}
-    (<a href='{{unbound topic_url}}'>{{topic_title}}</a>)
+    <a href='{{unbound topic_url}}'>{{topic_title}}</a>
   {{/if}}
 </div>
-<div class="col post_id">
+<div class="col post">
   {{#if post_id}}
-    <a href='{{unbound post_url}}'>{{post_id}}</a>
+    <a href='{{unbound post_url}}'>#{{post_number}} {{post_topic_title}}</a>
   {{/if}}
 </div>
-<div class="col category_id">
+<div class="col category">
   {{#if category_id}}
-    {{category_id}}
-    (<a href='{{unbound category_url}}'>{{category_name}}</a>)
+    <a href='{{unbound category_url}}'>{{category_name}}</a>
   {{/if}}
 </div>
 <div class="col external_url">
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index fa689540537..dc7e990616d 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -1473,20 +1473,20 @@ table#user-badges {
 // Permalinks
 
 .permalinks {
-  .url, .topic_id, .category_id, .external_url {
+  .url, .topic, .category, .external_url, .post {
     text-overflow: ellipsis;
     white-space: nowrap;
   }
   .url {
     width: 200px;
   }
-  .topic_id, .external_url {
-    width: 220px;
+  .topic, .post, .external_url {
+    width: 180px;
   }
-  .category_id {
-    width: 160px;
+  .category {
+    width: 140px;
   }
-  .action, .post_id {
+  .action {
     text-align: center;
     width: 8%;
   }
diff --git a/app/serializers/permalink_serializer.rb b/app/serializers/permalink_serializer.rb
index 3a7440888ec..98f2062f795 100644
--- a/app/serializers/permalink_serializer.rb
+++ b/app/serializers/permalink_serializer.rb
@@ -1,5 +1,5 @@
 class PermalinkSerializer < ApplicationSerializer
-  attributes :id, :url, :topic_id, :topic_title, :topic_url, :post_id, :post_url, :category_id, :category_name, :category_url, :external_url
+  attributes :id, :url, :topic_id, :topic_title, :topic_url, :post_id, :post_url, :post_number, :post_topic_title, :category_id, :category_name, :category_url, :external_url
 
   def topic_title
     object.try(:topic).try(:title)
@@ -13,6 +13,14 @@ class PermalinkSerializer < ApplicationSerializer
     object.try(:post).try(:url)
   end
 
+  def post_number
+    object.try(:post).try(:post_number)
+  end
+
+  def post_topic_title
+    object.try(:post).try(:topic).try(:title)
+  end
+
   def category_name
     object.try(:category).try(:name)
   end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 4b6020abf9a..d8f30a30749 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2447,8 +2447,11 @@ en:
         title: "Permalinks"
         url: "URL"
         topic_id: "Topic ID"
+        topic_title: "Topic"
         post_id: "Post ID"
+        post_title: "Post"
         category_id: "Category ID"
+        category_title: "Category"
         external_url: "External URL"
         delete_confirm: Are you sure you want to delete this permalink?
         form: