Merge pull request #132 from diggyk/edit-quest

Remove useless quest overview graphic
dropbox · Feb 8, 2016 · 44f8926 · 44f8926
2 parents 91cafb5 + 5e70c82
commit 44f8926
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 5 deletions.
diff --git a/hermes/webapp/src/css/main.less b/hermes/webapp/src/css/main.less
@@ -50,6 +50,10 @@
   padding: 0px;
 }
 
+a {
+  text-decoration: underline;
+}
+
 body {
   font-family: 'Titillium Web', Verdana;
   font-size: 1.2em;
@@ -226,6 +230,7 @@ a {
     margin-top: 20px;
     vertical-align: middle;
     a {
+      text-decoration: none;
       -moz-border-radius: 5px 5px 0px 0px;
       -webkit-border-radius: 5px 5px 0px 0px;
       border-bottom: 5px @header-color solid;
@@ -416,7 +421,41 @@ a {
 }
 
 .quest-details {
-  padding: 20px 0px 20px 0px;
+  padding: 0px 0px 20px 0px;
+  .quest-info-holder {
+    overflow: auto;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    .flex-row{
+      display: flex;
+      flex-flow: row nowrap;
+      align-items: flex-end;
+      &.overdue {
+        color: @red;
+      }
+    }
+    .quest-number {
+      padding: 5px;
+      width: 20%;
+      font-size: 1.75em;
+      font-weight: bold;
+      border-bottom: 2px solid @blue;
+    }
+    .sub-info {
+      font-size: 1em;
+      padding: 5px;
+      width: 80%;
+      border-bottom: 2px solid @blue;
+      text-align: right;
+    }
+    .description {
+      padding: 5px;
+      font-size: 1.5em;
+      font-weight: normal;
+      clear: both;
+    }
+  }
   .quest-overview {
     font-size: 1.5em;
     font-weight: bold;

diff --git a/hermes/webapp/src/templates/questStatus.html b/hermes/webapp/src/templates/questStatus.html
@@ -164,10 +164,22 @@
                         <img src="/img/loading.gif"/>
                     </div>
                     <div ng-if="qc.labors" class="quest-details">
-                        <div quest-progress-chart
-                             colors="qc.colors"
-                             types="qc.countByTypes"
-                             data="qc.selectedQuestDetails">
+                        <!--<div quest-progress-chart-->
+                             <!--colors="qc.colors"-->
+                             <!--types="qc.countByTypes"-->
+                             <!--data="qc.selectedQuestDetails">-->
+                        <!--</div>-->
+                        <div class="quest-info-holder">
+                            <div class="flex-row" ng-class="qc.selectedQuest.overDue ? 'overdue' : ''">
+                                <div class="quest-number">Quest {{qc.selectedQuest.id}}</div>
+                                <div class="sub-info">
+                                    <span ng-if="qc.selectedQuest.overDue">OVERDUE</span>
+                                    <span ng-if="qc.selectedQuest.targetTime">Due on: {{qc.selectedQuest.targetTime}} | </span>
+                                    <span>Created by <a href="mailto:{{qc.selectedQuest.creator}}">{{qc.selectedQuest.creator}}</a></span>
+                                    <span>on {{qc.selectedQuest.embarkTime}}</span>
+                                </div>
+                            </div>
+                            <div class="description">{{qc.selectedQuest.description}}</div>
                         </div>
                         <div class="quest-overview">
                             <span>