Merge "Stars should be next to the name of the entity"

src/app/search/template/project_group_search_item.html

@@ -2,6 +2,13 @@
     <a href="#!/project_group/{{projectGroup.name}}">
         {{projectGroup.title | truncate: 97}}
     </a>
+    <small ng-show="isLoggedIn">
+        <subscribe class="pull-left"
+               resource="project_group"
+               resource-id="projectGroup.id"
+               subscriptions="projectGroupSubscriptions">
+        </subscribe>
+    </small>
 </td>
 <td>
     <a href ng-click="collapsed = !collapsed"
@@ -58,12 +65,4 @@
         Hide {{projectGroupItems.length}} projects...
     </a>
 </td>
-<td>
-    <small ng-show="isLoggedIn">
-        <subscribe class="pull-right"
-               resource="project_group"
-               resource-id="projectGroup.id"
-               subscriptions="projectGroupSubscriptions">
-        </subscribe>
-    </small>
-</td>
+<td></td>

src/app/search/template/project_search_item.html

@@ -2,17 +2,16 @@
     <a href="#!/project/{{project.name}}">
         {{project.name | truncate: 97}}
     </a>
-    <br/>
-    <span class="text-muted">
-        {{project.description | truncate: 97}}
-    </span>
-</td>
-<td>
     <small ng-show="isLoggedIn">
-        <subscribe class="pull-right"
+        <subscribe
                resource="project"
                resource-id="project.id"
                subscriptions="projectSubscriptions">
         </subscribe>
     </small>
+    <br/>
+    <span class="text-muted">
+        {{project.description | truncate: 97}}
+    </span>
 </td>
+<td></td>

src/app/search/template/story_search_item.html

@@ -2,6 +2,13 @@
     <a href="#!/story/{{story.id}}">
         {{story.id}}: {{story.title | truncate: 97}}
     </a>
+    <small ng-show="isLoggedIn">
+        <subscribe
+               resource="story"
+               resource-id="story.id"
+               subscriptions="storySubscriptions">
+        </subscribe>
+    </small>
     <br/>
     <span class="text-muted">
         {{story.description | truncate: 97}}
@@ -26,12 +33,3 @@
 <td class="text-right col-xs-1">
     <story-status-label story="story"/>
 </td>
-<td class="text-right">
-    <small ng-show="isLoggedIn">
-        <subscribe class="pull-right"
-               resource="story"
-               resource-id="story.id"
-               subscriptions="storySubscriptions">
-        </subscribe>
-    </small>
-</td>

src/app/search/template/task_search_item.html

@@ -10,7 +10,15 @@
     <small class="text-muted"
            resolve-story="task.story_id">
         <a href="#!/story/{{story.id}}">
-            {{story.id}}: {{story.title}}</a>
+            {{story.id}}: {{story.title}}
+        </a>
+        <small ng-show="isLoggedIn">
+            <subscribe
+                   resource="story"
+                   resource-id="story.id"
+                   subscriptions="storySubscriptions">
+            </subscribe>
+        </small>
     </small>
 </td>
 <td>
@@ -19,13 +27,3 @@
             status="{{task.status}}"
             ></task-status-dropdown>
 </td>
-<td>
-    <small ng-show="isLoggedIn">
-        <subscribe class="pull-right"
-               resource="story"
-               resource-id="story.id"
-               subscriptions="storySubscriptions">
-        </subscribe>
-    </small>
-</td>
-

src/app/search/template/worklist_search_item.html

@@ -1,13 +1,13 @@
 <td>
-    <subscribe class="pull-right"
-               resource="worklist"
-               resource-id="worklist.id"
-               subscriptions="worklistSubscriptions">
-    </subscribe>
     <p>
         <a href="#!/worklist/{{worklist.id}}">
             {{worklist.title}}
         </a>
+        <subscribe
+                   resource="worklist"
+                   resource-id="worklist.id"
+                   subscriptions="worklistSubscriptions">
+        </subscribe>
     </p>
     <small>
         <span class="badge"