Merge pull request #41 from diggyk/master

Minor fix to quest description
dropbox · Sep 15, 2015 · 9984880 · 9984880
2 parents 8804f45 + 2f6fcf9
commit 9984880
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/hermes/version.py b/hermes/version.py
@@ -1 +1 @@
-__version__ = "0.3.3"
+__version__ = "0.3.5"
diff --git a/hermes/webapp/src/js/directives/questProgressChart.js b/hermes/webapp/src/js/directives/questProgressChart.js
@@ -54,6 +54,7 @@
                         if (renderTimeout) clearTimeout(renderTimeout);
 
                         function wrapText(text, textEle, maxWidth) {
+                            text = text.replace(/\s+/g, ' ').trim();
                             text = text.replace('\n', ' ');
                             var words = text.split(" ");
                             var wrappedText = '';

diff --git a/hermes/webapp/src/templates/questStatus.html b/hermes/webapp/src/templates/questStatus.html
@@ -8,16 +8,6 @@
                     <img src="/img/loading.gif"/>
                 </div>
             </div>
-            <!--<div class="quest-list-entry selected" ng-if="qc.selectedQuest">-->
-                <!--<div>-->
-                    <!--<strong>Quest {{qc.selectedQuest.id}}</strong>-->
-                <!--</div>-->
-                <!--<div>{{qc.selectedQuest.description}}</div>-->
-                <!--<div quest-progress-bar class="progbar"-->
-                     <!--data="qc.selectedQuest"></div>-->
-                <!--<div><span style="font-size: .8em">Embarked on: {{qc.selectedQuest.embarkTime}}</span>-->
-                <!--</div>-->
-            <!--</div>-->
             <div class="overviews" viewport-height padding="120">
                 <div class="quest-list-entry"
                      ng-repeat="quest in qc.questData track by quest.id"
@@ -30,6 +20,7 @@
                     <div quest-progress-bar class="progbar" data="quest"></div>
                     <div><span style="font-size: .8em">Embarked on: {{quest.embarkTime}}</span>
                     </div>
+                    <div><span style="font-size: .8em">Created by: {{quest.creator}}</span></div>
                 </div>
             </div>
         </div>