omassot 6 年之前
父节点
当前提交
03cf28cfa9
共有 3 个文件被更改,包括 23 次插入10 次删除
  1. 12 0
      main/static/css/custom.css
  2. 2 1
      main/templates/sprint_end.html
  3. 9 9
      main/templates/story_li.html

+ 12 - 0
main/static/css/custom.css

@@ -404,6 +404,17 @@ select[multiple] option {
 	text-decoration: underline;
 }
 
+.epic-tag {
+	color: #666666;
+	height: 22px;
+	font-size: 12px;
+	font-weight: 600;
+	padding: 2px 6px;
+	margin-right: 8px;
+	border-radius: 4px;
+	background-color: #d9d9d9;
+}
+
 .running {
 	color: #006622;
 	height: 22px;
@@ -434,6 +445,7 @@ select[multiple] option {
 	border-radius: 4px;
 }
 
+
 /* Epic details */
 
 .story-closed {

+ 2 - 1
main/templates/sprint_end.html

@@ -47,8 +47,9 @@
 					{% endif %}
 				</td>
 				
-				<td><a href="{% url 'story_details' story_id=story.id %}">{{ story.name }}</a></td>
+				<td width="50%"><a href="{% url 'story_details' story_id=story.id %}">{{ story.name }}</a></td>
 				
+				<td class="annotation">{% if story.epic_id %}<span>{{ story.epic.name }}</span>{% endif %}</td>
 				<td width="1%">{% if story.weight %}<span>{% include 'weight_svg.html' with weight=story.weight h=20 %}</span>{% endif %}</td>
 			</tr>
 		{% endfor %}

+ 9 - 9
main/templates/story_li.html

@@ -7,9 +7,7 @@
 
 			<div class="flex-extend">  {# partie gauche #}
 				<div class="story-title">
-					
 	    			<a href="{% url 'story_details' story_id=story.id %}?from={{ from }}"{% if story.closed %}class="story-closed"{% endif %}> {{ story.name }} </a>
-
 	    		</div>
 	    	</div>
 	    	
@@ -27,16 +25,18 @@
 	    <div class="flex-row">   {# ligne 2 #}
 	    	
 	    	<div class="flex-extend"> {# partie gauche #}
-    			<span class="annotation">Ajoutée le {{ story.created|date:"d M. Y" }} par {{ story.author.username }}</span>
-	    	</div>
+     		{% if from == "story_index" %}	
+	     		{% if story.epic_id %}
+	     		<div class="annotation">
+   					<a href="{% url 'epic_details' epic_id=story.epic_id %}">{{ story.epic.name }}</a>
+	  			</div>
+	  			{% endif %}
+   			{% endif %}
+   			</div>
 	    	
 	       	<div>  {# partie droite #}
 	       		<div class="annotation">		      
-	       			{% if from == "story_index" %}	
-	       				{% if story.epic_id %}
-	    				<a href="{% url 'epic_details' epic_id=story.epic_id %}">{{ story.epic.name }}</a>
-	    				{% endif %}
-	    			{% endif %}
+					<span class="annotation">Ajoutée le {{ story.created|date:"d M. Y" }} par {{ story.author.username }}</span>
 	   			</div>
 	       	</div>
 	    </div>