diff --git a/adhocracy_client/static/stylesheets/style.css b/adhocracy_client/static/stylesheets/style.css index 587d999d..8f9035b1 100755 --- a/adhocracy_client/static/stylesheets/style.css +++ b/adhocracy_client/static/stylesheets/style.css @@ -155,6 +155,12 @@ li.content_box .proposal_title { li.content_box .proposal_info { margin-left:125px; } +li.content_box .proposal_title_disvote { + margin-left:25px; +} +li.content_box .proposal_info_disvote { + margin-left:25px; +} li.content_box .comment_count { display: block; float: right; @@ -397,7 +403,7 @@ div #user_menu { .comment .comment_content :last-child { margin-bottom:9px } -.comment .comment_content {margin-left:35px;} +.comment .comment_content {margin-left:0px;} .comment .comment_content .floatbox {float: right;} .comment .comment_content li {margin-left: 20px;} .comment h5 {margin-top: 0;} diff --git a/adhocracy_client/templates/comment/tiles.html b/adhocracy_client/templates/comment/tiles.html index e43ee283..54e28438 100644 --- a/adhocracy_client/templates/comment/tiles.html +++ b/adhocracy_client/templates/comment/tiles.html @@ -103,9 +103,12 @@
${c.settings_menu.current['label']}
${_('Break down Voting Result by Badge')}
diff --git a/adhocracy_client/templates/poll/tiles.html b/adhocracy_client/templates/poll/tiles.html index 44347901..0ed25110 100644 --- a/adhocracy_client/templates/poll/tiles.html +++ b/adhocracy_client/templates/poll/tiles.html @@ -11,6 +11,7 @@ con = tile.widget_action_attrs(model.Vote.NO) %>${_('Last Activity')}
<% tally = c.proposal.rate_poll.tally %> + %if not c.instance.voting_disabled: ${sidebar_defs.votes(c.proposal.rate_poll)} ${sidebar_defs.votedetail(c.votedetail)} + %endif %if c.proposal.category:${_('Category')}
diff --git a/adhocracy_client/templates/proposal/tiles.html b/adhocracy_client/templates/proposal/tiles.html index e20202cb..e2ead994 100644 --- a/adhocracy_client/templates/proposal/tiles.html +++ b/adhocracy_client/templates/proposal/tiles.html @@ -11,14 +11,22 @@ 'votes': tally.num_for + tally.num_against } %> ++ + %if not c.instance.voting_disabled: +${str(proposal.rate_poll.tally.num_for)}${str(proposal.rate_poll.tally.num_against)}
+ %endif
+
+ ${proposal.title}
${tiles.badge.badges(proposal.badges + proposal.categories)}
-