Merge pull request #547 from topcoder-platform/issues-519_2

Issues-544

Author: jmgasper

config/vanilla/bootstrap.before.php

@@ -335,11 +335,11 @@ function dateUpdated($row, $wrap = null) {
      * @param int $categoryID
      * @return string
      */
-    function watchIcon($hasWatched = false) {
+    function watchIcon($hasWatched = false, $title='') {
         if($hasWatched) {
             $icon = <<<EOT
 <svg width="21px" height="14px" viewBox="0 0 21 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>C37BD87D-4683-4407-B623-A16FF477E263</title>
+    <title>$title</title>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="02-Challenge-Forums" transform="translate(-1261.000000, -328.000000)" fill="#0AB88A" fill-rule="nonzero">
             <path d="M1271.08333,328 C1266.5,328 1262.58583,330.850833 1261,334.875 C1262.58583,338.899167 1266.5,341.75 1271.08333,341.75 C1275.66667,341.75 1279.58083,338.899167 1281.16667,334.875 C1279.58083,330.850833 1275.66667,328 1271.08333,328 Z M1271.08333,339.458333 C1268.55333,339.458333 1266.5,337.405 1266.5,334.875 C1266.5,332.345 1268.55333,330.291667 1271.08333,330.291667 C1273.61333,330.291667 1275.66667,332.345 1275.66667,334.875 C1275.66667,337.405 1273.61333,339.458333 1271.08333,339.458333 Z M1271.08333,332.125 C1269.56167,332.125 1268.33333,333.353333 1268.33333,334.875 C1268.33333,336.396667 1269.56167,337.625 1271.08333,337.625 C1272.605,337.625 1273.83333,336.396667 1273.83333,334.875 C1273.83333,333.353333 1272.605,332.125 1271.08333,332.125 Z" id="Shape"></path>
@@ -350,7 +350,7 @@ function watchIcon($hasWatched = false) {
         } else {
             $icon = <<<EOT
          <svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>A8A8C574-0B97-4F46-826B-9E3C5F919266</title>
+    <title>$title</title>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="02-Challenge-Forums" transform="translate(-1260.000000, -594.000000)">
             <g id="watch-icon" transform="translate(1260.000000, 594.000000)">
@@ -388,8 +388,8 @@ function watchButton($category) {
             $categoryID= val('CategoryID', $category);
             $hasWatched = $categoryModel->hasWatched($categoryID, $userID);
 
-            $icon = watchIcon($hasWatched);
             $text = $hasWatched ? t('Stop watching the category') : t('Watch the category');
+            $icon = watchIcon($hasWatched, $text);
             $output .= anchor(
                 $icon,
                 $hasWatched ? "/category/watched/{$categoryID}/" . Gdn::session()->transientKey() : "/category/watch/{$categoryID}/" . Gdn::session()->transientKey(),

services/tideways.conf

@@ -6,9 +6,9 @@ priority=10
 command=/opt/docker/bin/service.d/tideways.sh
 process_name=%(program_name)s
 startsecs=0
-startretries=3
+startretries=0
 autostart=true
-autorestart=true
+autorestart=false
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr

vanilla/applications/vanilla/views/discussion/helper_functions.php

@@ -45,7 +45,7 @@ function writeBookmarkLink() {
         $output = '';
         $hasWatched = $discussion->Bookmarked == '1';
         $title = t($hasWatched? 'Stop watching the discussion' : 'Watch the discussion');
-        $icon = watchIcon($hasWatched);
+        $icon = watchIcon($hasWatched, $title);
         $output .= anchor(
             $icon,
             '/discussion/bookmark/'.$discussion->DiscussionID.'/'.Gdn::session()->transientKey().'?Target='.urlencode(Gdn::controller()->SelfUrl),

vanilla/applications/vanilla/views/discussions/helper_functions.php

@@ -73,7 +73,7 @@ function bookmarkButton($discussion) {
         // Bookmark link
         $hasWatched = $discussion->Bookmarked == '1';
         $title = t($hasWatched ? 'Stop watching the discussion' : 'Watch the discussion');
-        $icon = watchIcon($hasWatched);
+        $icon = watchIcon($hasWatched, $title);
         return anchor(
             $icon,
             '/discussion/bookmark/'.$discussion->DiscussionID.'/'.Gdn::session()->transientKey(),