Merge pull request #144 from diggyk/master

Restrict emailing machines owners to quest owners
dropbox · Feb 22, 2016 · 719e35f · 719e35f
2 parents 2256e7e + 311b447
commit 719e35f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/hermes/version.py b/hermes/version.py
@@ -1 +1 @@
-__version__ = "0.7.19"
+__version__ = "0.7.20"
diff --git a/hermes/webapp/src/css/main.less b/hermes/webapp/src/css/main.less
@@ -486,6 +486,9 @@ a {
       label, button {
         margin-top: 10px;
       }
+      .message-block-about {
+        font-size: 1.5em;
+      }
 
        -moz-transition: 0.5s ease-out all;
       -ms-transition: 0.5s ease-out all;

diff --git a/hermes/webapp/src/templates/questStatus.html b/hermes/webapp/src/templates/questStatus.html
@@ -174,7 +174,7 @@
                                     <span>Quest {{qc.selectedQuest.id}}</span>
                                     <span class="quest-buttons">
                                         <a ng-href="/v1/quests/{{qc.selectedQuest.id}}/edit"><span ng-if="qc.selectedQuest.creator == qc.user" id="toggleEditing" aria-label="Edit this quest" role="checkbox" class="glyphicon glyphicon-edit btn-glyph"></span></a>
-                                        <span id="toggleMailBlock" aria-label="Send email to this quest" role="checkbox" ng-class="{'selected': qc.showMessageBlock}" class="glyphicon glyphicon-envelope btn-glyph email-button" ng-click="qc.showMessageBlock=!qc.showMessageBlock" >
+                                        <span ng-if="qc.selectedQuest.creator == qc.user" id="toggleMailBlock" aria-label="Send email to this quest" role="checkbox" ng-class="{'selected': qc.showMessageBlock}" class="glyphicon glyphicon-envelope btn-glyph email-button" ng-click="qc.showMessageBlock=!qc.showMessageBlock" >
                                         </span>
                                     </span>
                                 </div>
@@ -187,6 +187,7 @@
                             </div>
                             <div class="success-message" ng-if="qc.createSuccessMessage">{{ qc.createSuccessMessage }}</div>
                             <div class="message-block" ng-if="qc.showMessageBlock">
+                                <div class="message-block-about">Send email to all machine owners involved with this quest.</div>
                                 <label for="messageSubject">Subject:</label>
                                 <input type="text" ng-model="qc.messageSubject" id="messageSubject"/>
                                 <label for="messageEmail">Email:</label>