# HG changeset patch # User bsw # Date 1330355951 -3600 # Node ID 5e6bdf07e3a10a1aef40787cb6b3ce0ba1b31b79 # Parent b3506522d043392492d68aad68866c9bd28e8b4c Some color and positioning changes again... diff -r b3506522d043 -r 5e6bdf07e3a1 app/main/initiative/_list_element.lua --- a/app/main/initiative/_list_element.lua Mon Feb 27 16:18:56 2012 +0100 +++ b/app/main/initiative/_list_element.lua Mon Feb 27 16:19:11 2012 +0100 @@ -37,7 +37,7 @@ }, { - field_attr = { style = "width: 110px;"}, + field_attr = { style = "width: 100px;"}, content = function() if initiative.issue.fully_frozen and initiative.issue.closed then if initiative.issue.ranks_available then @@ -74,7 +74,41 @@ end end }, + { + field_attr = { style = "width: 24px;" }, + content = function() + if initiative.is_initiator then + slot.put(" ") + local label = _"You are initiator of this initiative" + ui.image{ + attr = { alt = label, title = label }, + static = "icons/16/user_edit.png" + } + elseif initiative.is_supporter then + slot.put(" ") + local label = _"You are supporter of this initiative" + ui.image{ + attr = { alt = label, title = label }, + static = "icons/16/thumb_up_green.png" + } + elseif initiative.is_potential_supporter then + slot.put(" ") + local label = _"You are potentially supporter of this initiative" + ui.image{ + attr = { alt = label, title = label }, + static = "icons/16/thumb_up.png" + } + elseif initiative.is_supporter_via_delegation then + slot.put(" ") + local label = _"You are supporter of this initiative via delegation" + ui.image{ + attr = { alt = label, title = label }, + static = "icons/16/thumb_up_green.png" + } + end + end + }, { content = function() local link_class = "initiative_link" @@ -111,33 +145,6 @@ params = params, } - if initiative.is_supporter then - slot.put(" ") - local label = _"You are supporter of this initiative" - ui.image{ - attr = { alt = label, title = label }, - static = "icons/16/thumb_up_green.png" - } - end - - if initiative.is_supporter_via_delegation then - slot.put(" ") - local label = _"You are supporter of this initiative via delegation" - ui.image{ - attr = { alt = label, title = label }, - static = "icons/16/thumb_up_green.png" - } - end - - if initiative.is_initiator then - slot.put(" ") - local label = _"You are initiator of this initiative" - ui.image{ - attr = { alt = label, title = label }, - static = "icons/16/user_edit.png" - } - end - end } } diff -r b3506522d043 -r 5e6bdf07e3a1 app/main/issue/_list.lua --- a/app/main/issue/_list.lua Mon Feb 27 16:18:56 2012 +0100 +++ b/app/main/issue/_list.lua Mon Feb 27 16:19:11 2012 +0100 @@ -44,7 +44,16 @@ ui.container{ attr = { class = "issue_info" }, content = function() - if issue.is_interested_by_delegation_to_member_id then + if issue.is_interested then + ui.tag{ + tag = "div", attr = { class = "interest_by_delegation"}, + content = function() + local text = "You are interested in this issue" + ui.image{ attr = { alt = text, title = text }, static = "icons/16/eye.png" } + end + } + + elseif issue.is_interested_by_delegation_to_member_id then ui.tag{ tag = "div", attr = { class = "interest_by_delegation"}, content = function() diff -r b3506522d043 -r 5e6bdf07e3a1 static/style.css --- a/static/style.css Mon Feb 27 16:18:56 2012 +0100 +++ b/static/style.css Mon Feb 27 16:19:11 2012 +0100 @@ -201,7 +201,7 @@ .title { background-color: #ddd; background: -webkit-gradient(linear, left top, left bottom, - color-stop(15%,#ddd), color-stop(100%,#fff) + color-stop(15%,#ddd), color-stop(50%,#fff) ); text-shadow: #fff 0px 0px 3px; color: #000; @@ -224,13 +224,18 @@ } .slot_title2 { - margin-top: 1ex; - margin-left: 1em; + padding: 1ex 1em 0 1em; } .initiatives_list { clear: left; - margin-bottom: 1ex; +} + +.slot_initiatives_list { + border-top: 1px solid #aaa; + border-bottom: 1px solid #aaa; + padding-top: 1ex; + padding-bottom: 1ex; } .member_list .member_image_avatar { @@ -270,9 +275,8 @@ .slot_initiative_head { background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e7e7e7), color-stop(66%,#fff)); - margin-top: 2ex; padding-left: 1em; - padding-top: 2ex; + padding-top: 1ex; text-shadow: #fff 0px 0px 3px; } @@ -865,12 +869,12 @@ font-weight: bold; } -.initiative_link.supported { +x.initiative_link.supported { background-color: #cdf; border-radius: 5px; } -.initiative_link.potentially_supported { +x.initiative_link.potentially_supported { background-color: #cdf; border-radius: 5px; } @@ -1054,7 +1058,9 @@ .revoked_info { background-color: #fdd; padding: 1ex; + margin-top: 2ex; margin-bottom: 2ex; + border-radius: 8px; } .draft_updated_info,