From ce3271d8f0d23e8c58c9bc42100d709550fc9956 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Mon, 30 May 2016 18:07:04 -0400 Subject: [PATCH] hide the permission box, unless you're the one who can change the permission --- app/assets/stylesheets/application.css.erb | 3 ++- app/assets/stylesheets/base.css.erb | 9 ++++++++- app/views/layouts/_templates.html.erb | 6 +++--- app/views/maps/_mapinfobox.html.erb | 6 +++--- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/application.css.erb b/app/assets/stylesheets/application.css.erb index 6c76dd9e..4953f612 100644 --- a/app/assets/stylesheets/application.css.erb +++ b/app/assets/stylesheets/application.css.erb @@ -1572,6 +1572,7 @@ h3.filterBox { .commonsMap .mapContributors { visibility: hidden; + margin-left: 34px; } .mapContributors { @@ -1798,7 +1799,7 @@ input.collaboratorSearchField { width: 32px; height: 32px; padding: 0; - margin: 8px 30px 8px 10px; + margin: 8px 12px 8px 10px; position: relative; background-image: url(<%= asset_data_uri('permissions32_sprite.png') %>); } diff --git a/app/assets/stylesheets/base.css.erb b/app/assets/stylesheets/base.css.erb index 1fc0030b..0e4c501b 100644 --- a/app/assets/stylesheets/base.css.erb +++ b/app/assets/stylesheets/base.css.erb @@ -188,11 +188,14 @@ height: 48px; } .linkItem.contributor { - margin-left:40px; + margin-left:76px; z-index:1; padding:17px 16px 17px 30px; position: relative; } +.yourTopic .linkItem.contributor { + margin-left: 40px; +} .contributor .contributorIcon { position: absolute; top: 8px; @@ -376,6 +379,7 @@ .mapPerm { + display: none; width: 32px; height: 32px; padding: 0; @@ -385,6 +389,9 @@ background-image: url(<%= asset_data_uri('permissions32_sprite.png') %>); background-position: 0 0; } +.yourTopic .mapPerm { + display: block; +} .mapPerm.co { background-position: 0 0; } diff --git a/app/views/layouts/_templates.html.erb b/app/views/layouts/_templates.html.erb index 7e5a6293..cfd9ee55 100644 --- a/app/views/layouts/_templates.html.erb +++ b/app/views/layouts/_templates.html.erb @@ -15,15 +15,15 @@ {{contributor_count}}
{{{contributor_list}}}
+
+ {{{map_creator_tip}}} +
{{topic_count}}
{{synapse_count}}
-
- {{{map_creator_tip}}} -
diff --git a/app/views/maps/_mapinfobox.html.erb b/app/views/maps/_mapinfobox.html.erb index 0b8caf69..bce2a152 100644 --- a/app/views/maps/_mapinfobox.html.erb +++ b/app/views/maps/_mapinfobox.html.erb @@ -41,15 +41,15 @@ <% end %>
+
+
As the creator, you can change the permission of this map, and the permission of all the topics and synapses you have authority to change will change as well.
+
<%= @map.topics.count %>
<%= @map.synapses.count %>
-
-
As the creator, you can change the permission of this map, and the permission of all the topics and synapses you have authority to change will change as well.
-