watch: Change project watch options

- Turn on watch at project creation and added by member - Show project watch status at group page
yona-projects · Jan 17, 2016 · facd4b6 · facd4b6
1 parent 9684b12
commit facd4b6
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/app/assets/stylesheets/less/_page.less b/app/assets/stylesheets/less/_page.less
@@ -6373,3 +6373,20 @@ div.diff-body[data-outdated="true"] tr:hover .icon-comment {
     }
   }
 }
+
+.stats-wrap {
+    i {
+        font-size: 16px;
+        margin-left: 5px;
+        margin-right: 5px;
+    }
+    .yobicon-lightbulb {
+        &.ramp-on {
+            color: #B6DA54;
+        }
+        &.ramp-off {
+            color: #DADADA;
+        }
+    }
+}
+
diff --git a/app/controllers/ProjectApp.java b/app/controllers/ProjectApp.java
@@ -196,6 +196,7 @@ public static Result newProject() throws Exception {
         RepositoryService.createRepository(project);
 
         saveProjectMenuSetting(project);
+        Watch.watch(project.asResource());
 
         return redirect(routes.ProjectApp.project(project.owner, project.name));
     }
@@ -840,6 +841,7 @@ public static Result newMember(String ownerId, String projectName) {
         if(HttpUtil.isJSONPreferred(request())){
             return ok("{}");
         }
+        Watch.watch(newMember, project.asResource());
         return redirect(routes.ProjectApp.members(ownerId, projectName));
     }
 

diff --git a/app/views/organization/view.scala.html b/app/views/organization/view.scala.html
@@ -44,6 +44,12 @@
 }
 }
 
+@amIWatching(project:Project) = {
+    @if(User.isWatching(project)) {
+        "watch-on"
+    }
+}
+
 @organizationLayout(org.name, utils.MenuType.NONE, org) {
 @header(org)
 @menu(org)
@@ -117,7 +123,12 @@ <h3><span id="project-description">@org.descr</span></h3>
                                 </ul>
                                 <p>
                                     @Html(Messages("project.onmember", User.findUsersByProject(project.id).size))
-                                    <i class="yobicon-eye yobicon-middle"></i> @Html(Messages("project.onwatching", project.getWatchingCount))
+                                <i class="yobicon-eye"></i> @Html(Messages("project.onwatching", project.getWatchingCount))
+                                    @if(User.isWatching(project)) {
+                                        <i class="yobicon-lightbulb ramp-on" data-toggle="tooltip" title="@Messages("project.default.group.watching")"></i>
+                                    } else {
+                                        <i class="yobicon-lightbulb ramp-off" data-toggle="tooltip" title="@Messages("project.you.are.not.watching", "")"></i>
+                                    }
                                 </p>
                             </div>
                         </div>