modification de la forme des tickets

Jean-François Pineau · Jean-François Pineau · commit 22c5c4dd61ef · 2014-09-04T16:05:08.000+02:00
diff --git a/app/views/my_card/index.html.erb b/app/views/my_card/index.html.erb
@@ -73,18 +73,18 @@
 </form>
 
 <div class="ticket ticket-modele">
-	<a href="#" class="id"></a>
-	<span class="subject"></span>
 	<div class="line">
 		Histoire : <a href="#" class="parent"></a>
 	</div>
+	<a href="#" class="id"></a>
+	<span class="subject"></span>
 	<div class="line custom-field anomalie">
 		Type anomalie: <span></span>
 	</div>
-	<div class="line custom-field start">
+	<div class="block custom-field start">
 		Condition de départ: <span></span>
 	</div>
-	<div class="line custom-field finish">
+	<div class="block custom-field finish">
 		Condition d'acceptation: <span></span>
 	</div>
 	<div class="line">
diff --git a/assets/javascripts/card.js b/assets/javascripts/card.js
@@ -161,7 +161,11 @@
 
 		jQuery('.id',ticketCard).html(issue.id).attr('href',relativeUrl+'/issues/'+issue.id);
 		//jQuery('.project',ticketCard).html(issue.project.name).attr('href',relativeUrl+'/projects/'+issue.project.name+'/issues');
-		jQuery('.parent',ticketCard).html(issue.parent).attr('href',relativeUrl+'/issues/'+issue.parent.id);
+		if (issue.parent) {
+			jQuery('.parent',ticketCard).html(issue.parent).attr('href',relativeUrl+'/issues/'+issue.parent.id);
+		} else {
+			jQuery('.parent').hide();
+		}
 		jQuery('.subject',ticketCard).html(issue.subject);
 
 		if(issue.story_points){
@@ -178,16 +182,16 @@
 					jQuery('.anomalie').show();
 				}
 				if(issue.custom_fields[i].name=="Conditions de d\u00e9part"){
+					jQuery('.start').show();
 					if(issue.custom_fields[i].value){
 						jQuery('.start span',ticketCard).html(issue.custom_fields[i].value);
 					}
-					jQuery('.start').show();
 				}
 				if(issue.custom_fields[i].name=="Conditions d'acceptation"){
+					jQuery('.finish').show();
 					if(issue.custom_fields[i].value){
 						jQuery('.finish span',ticketCard).html(issue.custom_fields[i].value);
 					}
-					jQuery('.finish').show();
 				}
 			}
 		}
diff --git a/assets/stylesheets/card.css b/assets/stylesheets/card.css
@@ -51,25 +51,29 @@
 
 .ticket  .line{
 	display:block;
-	font-weight:bold;
 	margin-top:5px;
 }
 
 .ticket  .line span{
 	font-weight:normal;
 }
 
-.ticket  .author{
-}
+.ticket  .block{
+	display:block;
 
-.ticket  .category{
+	margin:5px;
 }
 
-.ticket  .createdOn{
-	
+.ticket  .block span{
+	display:block;
+	border: solid 1px black;
+	width: 100%;
+	margin:5px;
 }
 
 
+
+
 #cbp_images_form{ /* Hide Plugin Clipboard image paste*/
 	display:none;
 }
diff --git a/init.rb b/init.rb
@@ -9,5 +9,5 @@
   url 'https://github.com/w3blogfr/redmine_card'
   author_url 'http://w3blog.fr'
 
-  menu :top_menu, :card, { :controller => 'my_card', :action => 'my_index' }, :caption => 'My Card Board', :before => :projects, :if => Proc.new { User.current.logged? }
+  menu :top_menu, :card, { :controller => 'my_card', :action => 'my_index' }, :caption => 'Impression de tickets', :before => :projects, :if => Proc.new { User.current.logged? }
 end

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,11 @@`
`161`	`161`
`162`	`162`	`jQuery('.id',ticketCard).html(issue.id).attr('href',relativeUrl+'/issues/'+issue.id);`
`163`	`163`	`//jQuery('.project',ticketCard).html(issue.project.name).attr('href',relativeUrl+'/projects/'+issue.project.name+'/issues');`
`164`		`- jQuery('.parent',ticketCard).html(issue.parent).attr('href',relativeUrl+'/issues/'+issue.parent.id);`
	`164`	`+ if (issue.parent) {`
	`165`	`+ jQuery('.parent',ticketCard).html(issue.parent).attr('href',relativeUrl+'/issues/'+issue.parent.id);`
	`166`	`+ } else {`
	`167`	`+ jQuery('.parent').hide();`
	`168`	`+ }`
`165`	`169`	`jQuery('.subject',ticketCard).html(issue.subject);`
`166`	`170`
`167`	`171`	`if(issue.story_points){`
`@@ -178,16 +182,16 @@`
`178`	`182`	`jQuery('.anomalie').show();`
`179`	`183`	`}`
`180`	`184`	`if(issue.custom_fields[i].name=="Conditions de d\u00e9part"){`
	`185`	`+ jQuery('.start').show();`
`181`	`186`	`if(issue.custom_fields[i].value){`
`182`	`187`	`jQuery('.start span',ticketCard).html(issue.custom_fields[i].value);`
`183`	`188`	`}`
`184`		`- jQuery('.start').show();`
`185`	`189`	`}`
`186`	`190`	`if(issue.custom_fields[i].name=="Conditions d'acceptation"){`
	`191`	`+ jQuery('.finish').show();`
`187`	`192`	`if(issue.custom_fields[i].value){`
`188`	`193`	`jQuery('.finish span',ticketCard).html(issue.custom_fields[i].value);`
`189`	`194`	`}`
`190`		`- jQuery('.finish').show();`
`191`	`195`	`}`
`192`	`196`	`}`
`193`	`197`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,25 +51,29 @@`
`51`	`51`
`52`	`52`	`.ticket .line{`
`53`	`53`	`display:block;`
`54`		`- font-weight:bold;`
`55`	`54`	`margin-top:5px;`
`56`	`55`	`}`
`57`	`56`
`58`	`57`	`.ticket .line span{`
`59`	`58`	`font-weight:normal;`
`60`	`59`	`}`
`61`	`60`
`62`		`-.ticket .author{`
`63`		`-}`
	`61`	`+.ticket .block{`
	`62`	`+ display:block;`
`64`	`63`
`65`		`-.ticket .category{`
	`64`	`+ margin:5px;`
`66`	`65`	`}`
`67`	`66`
`68`		`-.ticket .createdOn{`
`69`		`-`
	`67`	`+.ticket .block span{`
	`68`	`+ display:block;`
	`69`	`+ border: solid 1px black;`
	`70`	`+ width: 100%;`
	`71`	`+ margin:5px;`
`70`	`72`	`}`
`71`	`73`
`72`	`74`
	`75`	`+`
	`76`	`+`
`73`	`77`	`#cbp_images_form{ /* Hide Plugin Clipboard image paste*/`
`74`	`78`	`display:none;`
`75`	`79`	`}`