liquid_feedback_frontend
changeset 312:5e6bdf07e3a1
Some color and positioning changes again...
author | bsw |
---|---|
date | Mon Feb 27 16:19:11 2012 +0100 (2012-02-27) |
parents | b3506522d043 |
children | 56dc44366c38 |
files | app/main/initiative/_list_element.lua app/main/issue/_list.lua static/style.css |
line diff
1.1 --- a/app/main/initiative/_list_element.lua Mon Feb 27 16:18:56 2012 +0100 1.2 +++ b/app/main/initiative/_list_element.lua Mon Feb 27 16:19:11 2012 +0100 1.3 @@ -37,7 +37,7 @@ 1.4 }, 1.5 1.6 { 1.7 - field_attr = { style = "width: 110px;"}, 1.8 + field_attr = { style = "width: 100px;"}, 1.9 content = function() 1.10 if initiative.issue.fully_frozen and initiative.issue.closed then 1.11 if initiative.issue.ranks_available then 1.12 @@ -74,7 +74,41 @@ 1.13 end 1.14 end 1.15 }, 1.16 + { 1.17 + field_attr = { style = "width: 24px;" }, 1.18 + content = function() 1.19 + if initiative.is_initiator then 1.20 + slot.put(" ") 1.21 + local label = _"You are initiator of this initiative" 1.22 + ui.image{ 1.23 + attr = { alt = label, title = label }, 1.24 + static = "icons/16/user_edit.png" 1.25 + } 1.26 + elseif initiative.is_supporter then 1.27 + slot.put(" ") 1.28 + local label = _"You are supporter of this initiative" 1.29 + ui.image{ 1.30 + attr = { alt = label, title = label }, 1.31 + static = "icons/16/thumb_up_green.png" 1.32 + } 1.33 + elseif initiative.is_potential_supporter then 1.34 + slot.put(" ") 1.35 + local label = _"You are potentially supporter of this initiative" 1.36 + ui.image{ 1.37 + attr = { alt = label, title = label }, 1.38 + static = "icons/16/thumb_up.png" 1.39 + } 1.40 + elseif initiative.is_supporter_via_delegation then 1.41 + slot.put(" ") 1.42 + local label = _"You are supporter of this initiative via delegation" 1.43 + ui.image{ 1.44 + attr = { alt = label, title = label }, 1.45 + static = "icons/16/thumb_up_green.png" 1.46 + } 1.47 + end 1.48 1.49 + end 1.50 + }, 1.51 { 1.52 content = function() 1.53 local link_class = "initiative_link" 1.54 @@ -111,33 +145,6 @@ 1.55 params = params, 1.56 } 1.57 1.58 - if initiative.is_supporter then 1.59 - slot.put(" ") 1.60 - local label = _"You are supporter of this initiative" 1.61 - ui.image{ 1.62 - attr = { alt = label, title = label }, 1.63 - static = "icons/16/thumb_up_green.png" 1.64 - } 1.65 - end 1.66 - 1.67 - if initiative.is_supporter_via_delegation then 1.68 - slot.put(" ") 1.69 - local label = _"You are supporter of this initiative via delegation" 1.70 - ui.image{ 1.71 - attr = { alt = label, title = label }, 1.72 - static = "icons/16/thumb_up_green.png" 1.73 - } 1.74 - end 1.75 - 1.76 - if initiative.is_initiator then 1.77 - slot.put(" ") 1.78 - local label = _"You are initiator of this initiative" 1.79 - ui.image{ 1.80 - attr = { alt = label, title = label }, 1.81 - static = "icons/16/user_edit.png" 1.82 - } 1.83 - end 1.84 - 1.85 end 1.86 } 1.87 }
2.1 --- a/app/main/issue/_list.lua Mon Feb 27 16:18:56 2012 +0100 2.2 +++ b/app/main/issue/_list.lua Mon Feb 27 16:19:11 2012 +0100 2.3 @@ -44,7 +44,16 @@ 2.4 2.5 ui.container{ attr = { class = "issue_info" }, content = function() 2.6 2.7 - if issue.is_interested_by_delegation_to_member_id then 2.8 + if issue.is_interested then 2.9 + ui.tag{ 2.10 + tag = "div", attr = { class = "interest_by_delegation"}, 2.11 + content = function() 2.12 + local text = "You are interested in this issue" 2.13 + ui.image{ attr = { alt = text, title = text }, static = "icons/16/eye.png" } 2.14 + end 2.15 + } 2.16 + 2.17 + elseif issue.is_interested_by_delegation_to_member_id then 2.18 ui.tag{ 2.19 tag = "div", attr = { class = "interest_by_delegation"}, 2.20 content = function()
3.1 --- a/static/style.css Mon Feb 27 16:18:56 2012 +0100 3.2 +++ b/static/style.css Mon Feb 27 16:19:11 2012 +0100 3.3 @@ -201,7 +201,7 @@ 3.4 .title { 3.5 background-color: #ddd; 3.6 background: -webkit-gradient(linear, left top, left bottom, 3.7 - color-stop(15%,#ddd), color-stop(100%,#fff) 3.8 + color-stop(15%,#ddd), color-stop(50%,#fff) 3.9 ); 3.10 text-shadow: #fff 0px 0px 3px; 3.11 color: #000; 3.12 @@ -224,13 +224,18 @@ 3.13 } 3.14 3.15 .slot_title2 { 3.16 - margin-top: 1ex; 3.17 - margin-left: 1em; 3.18 + padding: 1ex 1em 0 1em; 3.19 } 3.20 3.21 .initiatives_list { 3.22 clear: left; 3.23 - margin-bottom: 1ex; 3.24 +} 3.25 + 3.26 +.slot_initiatives_list { 3.27 + border-top: 1px solid #aaa; 3.28 + border-bottom: 1px solid #aaa; 3.29 + padding-top: 1ex; 3.30 + padding-bottom: 1ex; 3.31 } 3.32 3.33 .member_list .member_image_avatar { 3.34 @@ -270,9 +275,8 @@ 3.35 .slot_initiative_head { 3.36 background: -webkit-gradient(linear, left top, left bottom, 3.37 color-stop(0%,#e7e7e7), color-stop(66%,#fff)); 3.38 - margin-top: 2ex; 3.39 padding-left: 1em; 3.40 - padding-top: 2ex; 3.41 + padding-top: 1ex; 3.42 text-shadow: #fff 0px 0px 3px; 3.43 } 3.44 3.45 @@ -865,12 +869,12 @@ 3.46 font-weight: bold; 3.47 } 3.48 3.49 -.initiative_link.supported { 3.50 +x.initiative_link.supported { 3.51 background-color: #cdf; 3.52 border-radius: 5px; 3.53 } 3.54 3.55 -.initiative_link.potentially_supported { 3.56 +x.initiative_link.potentially_supported { 3.57 background-color: #cdf; 3.58 border-radius: 5px; 3.59 } 3.60 @@ -1054,7 +1058,9 @@ 3.61 .revoked_info { 3.62 background-color: #fdd; 3.63 padding: 1ex; 3.64 + margin-top: 2ex; 3.65 margin-bottom: 2ex; 3.66 + border-radius: 8px; 3.67 } 3.68 3.69 .draft_updated_info,