glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

merge shai's changes

Browse source
This commit is contained in:
Connor Turland 2014-09-09 18:20:17 -04:00
parent d2760b8688 d18806bb18
commit 3a7501cc7a
4 changed files with 143 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/metamaps/Metamaps.GlobalUI.js
View file

@ -210,6 +210,9 @@ Metamaps.GlobalUI.CreateMap = {
self.newMap.set('permission', $(this).attr('data-permission')); self.newMap.set('permission', $(this).attr('data-permission'));
$(this).siblings('.permIcon').find('.mapPermIcon').removeClass('selected'); $(this).siblings('.permIcon').find('.mapPermIcon').removeClass('selected');
$(this).find('.mapPermIcon').addClass('selected'); $(this).find('.mapPermIcon').addClass('selected');
var permText = $(this).find('.tip').html();
$(this).parents('.new_map').find('.permText').html(permText);
}, },
submit: function (event) { submit: function (event) {
event.preventDefault(); event.preventDefault();

162
app/assets/stylesheets/application.css
View file

@ -898,15 +898,6 @@ float: left;
.rightclickmenu .rc-permission:hover ul, .rightclickmenu .rc-metacode:hover ul { .rightclickmenu .rc-permission:hover ul, .rightclickmenu .rc-metacode:hover ul {
display: block; display: block;
} }
.rightclickmenu .rc-permission .toCommons {
background-image: url(CO64.png);
}
.rightclickmenu .rc-permission .toPublic {
background-image: url(PU64.png);
}
.rightclickmenu .rc-permission .toPrivate {
background-image: url(PR64.png);
}
.rightclickmenu p { .rightclickmenu p {
padding: 7px; padding: 7px;
} }
@ -937,15 +928,6 @@ float: left;
background-position: center center; background-position: center center;
background-size: 16px 16px; background-size: 16px 16px;
} }
#new_topic .topicPermission.commons {
background-image: url(CO64.png);
}
#new_topic .topicPermission.public {
background-image: url(PU64.png);
}
#new_topic .topicPermission.private {
background-image: url(PR64.png);
}
#new_topic .topicOriginatorIcon { #new_topic .topicOriginatorIcon {
position: relative; position: relative;
width: 20px; width: 20px;
@ -1008,15 +990,6 @@ float: left;
background-position: center center; background-position: center center;
background-size: 16px 16px; background-size: 16px 16px;
} }
#new_synapse .synapsePermission.commons {
background-image: url(CO64.png);
}
#new_synapse .synapsePermission.public {
background-image: url(PU64.png);
}
#new_synapse .synapsePermission.private {
background-image: url(PR64.png);
}
#new_synapse .synapseOriginatorIcon { #new_synapse .synapseOriginatorIcon {
position: relative; position: relative;
width: 20px; width: 20px;
@ -1289,7 +1262,7 @@ float: left;
padding: 0 0 0 0; padding: 0 0 0 0;
} }
.lightboxContent h3.forCreateMap { .lightboxContent h3.forCreateMap {
text-align: center; text-align: left;
} }
#svi { #svi {
padding-top: 56px; padding-top: 56px;
@ -1373,6 +1346,28 @@ float: left;
background-position-x: -128px; background-position-x: -128px;
} }
.permIcon .mapCrePermIcon {
background-image: url(permissions64sprite.png);
background-repeat: no-repeat;
width:64px;
height:64px;
margin:10px auto;
background-position: 0 0;
}
.mapCrePermIcon:hover {
background-position-y: -64px;
}
#map_CO {
background-position-x: 0;
}
#map_PU {
background-position-x: -64px;
}
#map_PR {
background-position-x: -128px;
}
/* jquery ui tabs */ /* jquery ui tabs */
.ui-tabs-hide { .ui-tabs-hide {
@ -1504,17 +1499,22 @@ float: left;
} }
.new_map .inputGroup { .new_map .inputGroup {
margin: 15px 0 5px; margin: 15px 0 5px;
position: relative;
} }
.new_map label { .new_map label {
float: left; float: left;
width: 100px; width: 100px;
text-align: right; text-align: left;
margin-right: 15px; margin-right: 15px;
font-size: 18px;
color: #424242;
font-family: 'din-regular', helvetica, sans-serif;
} }
.new_map input[type="text"] { .new_map input[type="text"] {
width: 336px; font-family: 'din-medium', helvetica, sans-serif;
width: 400px;
height: 32px; height: 32px;
font-size: 15px; font-size: 14px;
direction: ltr; direction: ltr;
-webkit-appearance: none; -webkit-appearance: none;
appearance: none; appearance: none;
@ -1529,9 +1529,8 @@ float: left;
box-sizing: border-box; box-sizing: border-box;
-webkit-border-radius: 1px; -webkit-border-radius: 1px;
-moz-border-radius: 1px; -moz-border-radius: 1px;
border-radius: 1px; border-radius: 2px;
font: -webkit-small-control; color: #424242;
color: initial;
letter-spacing: normal; letter-spacing: normal;
word-spacing: normal; word-spacing: normal;
text-transform: none; text-transform: none;
@ -1539,7 +1538,7 @@ float: left;
text-shadow: none; text-shadow: none;
display: inline-block; display: inline-block;
text-align: start; text-align: start;
font-family: arial; float: right;
} }
.new_map input[type="text"]:hover, .new_map input[type="text"]:hover,
.new_map textarea:hover { .new_map textarea:hover {
@ -1550,93 +1549,100 @@ float: left;
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
} }
.new_map textarea { .new_map textarea {
color: #424242;
padding: 8px; padding: 8px;
border: 1px solid #d9d9d9; border: 1px solid #d9d9d9;
border-top: 1px solid #c0c0c0; border-top: 1px solid #c0c0c0;
resize: none; resize: none;
font: -webkit-small-control;
letter-spacing: normal; letter-spacing: normal;
word-spacing: normal; word-spacing: normal;
text-transform: none; text-transform: none;
text-indent: 0px; text-indent: 0px;
text-shadow: none; text-shadow: none;
text-align: start; text-align: start;
font-family: arial; font-family: 'din-medium', helvetica, sans-serif;
font-size: 15px; font-size: 14px;
line-height: 17px; line-height: 17px;
width: 318px; width: 400px;
box-sizing: border-box;
float: right;
border-radius: 2px;
}
.permHelper {
position: absolute;
width: 128px;
top: 36px;
color: #424242;
font-family: 'din-regular', helvetica, sans-serif;
font-size: 12px;
}
.permIconWrapper {
width: 276px;
padding: 0 62px;
float: right;
} }
.new_map .permIcon { .new_map .permIcon {
float: left; float: left;
width: 92px; width: 92px;
height: 85px; height: 102px;
position: relative; position: relative;
} }
.new_map .mapPermIcon { .new_map .mapPermIcon {
width: 60px; background-image: url(permissions64sprite.png);
background-repeat: no-repeat;
width:64px;
height:64px;
margin:10px auto 0;
background-position: 0 0;
/* width: 60px;
height: 60px; height: 60px;
background-size: 48px 48px; background-size: 48px 48px;
background-position: center center; background-position: center center;
background-repeat: no-repeat; background-repeat: no-repeat;
margin: 0 auto; margin: 0 auto;
cursor: pointer; cursor: pointer;*/
} }
.new_map .mapCommonsIcon { .mapPermIcon:hover, .mapPermIcon.selected {
background-image: url(CO64.png); background-position-y: -64px;
} }
.new_map .mapPublicIcon { #newmap_co {
background-image: url(PU64.png); background-position-x: 0;
} }
.new_map .mapPrivateIcon { #newmap_pu {
background-image: url(PR64.png); background-position-x: -64px;
} }
.new_map .mapCommonsIcon.selected, #newmap_pr {
.new_map .mapCommonsIcon:hover { background-position-x: -128px;
background-image: url(CO64b.png);
}
.new_map .mapPublicIcon.selected,
.new_map .mapPublicIcon:hover {
background-image: url(PU64b.png);
}
.new_map .mapPrivateIcon.selected,
.new_map .mapPrivateIcon:hover {
background-image: url(PR64b.png);
} }
.new_map .permIcon h4 { .new_map .permIcon h4 {
font-style: italic; font-style: italic;
font-family: 'Vinyl'; font-family: 'Vinyl';
text-transform: uppercase; text-transform: uppercase;
font-size: 18px; font-size: 18px;
line-height: 20px; line-height: 20px;
color: black; color: #424242 ;
text-align: center; text-align: center;
} }
.new_map .tip { .new_map .tip {
display: none; display: none;
position: absolute;
background: black;
width: 150px;
top: 85px;
left: -29px;
color: white;
border-radius: 4px;
font-size: 15px !important;
line-height: 17px;
padding: 3px 5px 2px;
z-index: 100;
text-align: center;
}
.new_map .hoverForTip:hover .tip {
display: block;
} }
.permText { .permText {
width: 360px; width: 360px;
margin: 0 auto; margin: 16px 20px 0;
text-align: center; text-align: center;
float: right;
color: #424242;
font-family: 'din-regular', helvetica, sans-serif;
font-size: 14px;
} }
.buttonWrapper { .buttonWrapper {
margin: 10px 0 0 131px; width: 274px;
width: 254px; float:right;
margin: 16px 0 0 0;
} }
.onConsole .new_map button.cancel { .onConsole .new_map button.cancel {
margin-right: 20px; margin-right: 20px;

56
app/views/layouts/_newmap.html.erb
View file

@ -4,7 +4,7 @@
#%> #%>
<div class="onConsole"> <div class="onConsole">
<%= form_for Map.new, url: maps_url, remote: true, html: { class: "new_map", id: "new_map" } do |form|%> <%= form_for Map.new, url: maps_url, remote: true, html: { class: "new_map", id: "new_map" } do |form|%>
<h3 class="forCreateMap">Create A New Map</h3> <h3 class="forCreateMap">Create New Map</h3>
<div class="inputGroup"> <div class="inputGroup">
<label for="map_name">Name: </label> <label for="map_name">Name: </label>
@ -19,43 +19,43 @@
</div> </div>
<div class="inputGroup"> <div class="inputGroup">
<label for="map_permission">Permission: </label> <label for="map_permission">Permission*: </label>
<p class="permHelper">*new topics and synapses take on the same permission as the map they are created on</p>
<div class="permIcon" data-permission="commons"> <div class="permIconWrapper">
<div class="mapCommonsIcon mapPermIcon selected hoverForTip"> <div class="permIcon" data-permission="commons">
<div class="tip"> <div id="newmap_co" class="mapCommonsIcon mapPermIcon selected">
Collaborate with other mappers on editing this map. Those without accounts can view this map. <div class="tip">
Collaborate with other mappers on editing this map. Those without accounts can view this map.
</div>
</div>
<h4>COMMONS</h4>
</div> </div>
</div> <div class="permIcon" data-permission="public">
<h4>COMMONS</h4> <div id="newmap_pu" class="mapPublicIcon mapPermIcon">
</div> <div class="tip">
<div class="permIcon" data-permission="public"> Anyone, with or without an account, can view this map but not edit anything.
<div class="mapPublicIcon mapPermIcon hoverForTip"> </div>
<div class="tip"> </div>
Anyone, with or without an account, can view this map but not edit anything. <h4>PUBLIC</h4>
</div> </div>
</div> <div class="permIcon" data-permission="private">
<h4>PUBLIC</h4> <div id="newmap_pr" class="mapPrivateIcon mapPermIcon">
</div> <div class="tip">
<div class="permIcon" data-permission="private"> Only you can view or edit this map.
<div class="mapPrivateIcon mapPermIcon hoverForTip"> </div>
<div class="tip"> </div>
Only you can view or edit this map. <h4>PRIVATE</h4>
</div> </div>
</div> <div class="clearfloat"></div>
<h4>PRIVATE</h4>
</div> </div>
<p class="permText">Collaborate with other mappers on editing this map. Those without accounts can view this map.</p>
<div class="clearfloat"></div> <div class="clearfloat"></div>
</div> </div>
<p class="permText">*new topics and synapses take on the same permission as the map they are created on</p>
<div class="buttonWrapper"> <div class="buttonWrapper">
<button class="button cancel">Cancel</button> <button class="button cancel">Cancel</button>
<button class="button submitMap">Create!</button> <button class="button submitMap">Create!</button>
</div> </div>
<div class="clearfloat"></div> <div class="clearfloat"></div>
<% end %> <% end %>
</div> </div>

55
app/views/shared/_forkmap.html.erb
View file

@ -18,43 +18,44 @@
</div> </div>
<div class="inputGroup"> <div class="inputGroup">
<label for="map_desc">Description: </label> <label for="map_desc">Description: </label>
<%= form.text_area :desc, class: "description", :rows => 5, :cols => 43 %> <%= form.text_area :desc, class: "description", :rows => 5, :cols => 43 %>
<div class="clearfloat"></div> <div class="clearfloat"></div>
</div> </div>
<div class="inputGroup"> <div class="inputGroup">
<label for="map_permission">Permission: </label> <label for="map_permission">Permission*: </label>
<p class="permHelper">*new topics and synapses take on the same permission as the map they are created on</p>
<div class="permIcon" data-permission="commons"> <div class="permIconWrapper">
<div class="mapCommonsIcon mapPermIcon selected hoverForTip"> <div class="permIcon" data-permission="commons">
<div class="tip"> <div id="newmap_co" class="mapCommonsIcon mapPermIcon selected">
Collaborate with other mappers on editing this map. Those without accounts can view this map. <div class="tip">
Collaborate with other mappers on editing this map. Those without accounts can view this map.
</div>
</div>
<h4>COMMONS</h4>
</div> </div>
</div> <div class="permIcon" data-permission="public">
<h4>COMMONS</h4> <div id="newmap_pu" class="mapPublicIcon mapPermIcon">
</div> <div class="tip">
<div class="permIcon" data-permission="public"> Anyone, with or without an account, can view this map but not edit anything.
<div class="mapPublicIcon mapPermIcon hoverForTip"> </div>
<div class="tip"> </div>
Anyone, with or without an account, can view this map but not edit anything. <h4>PUBLIC</h4>
</div> </div>
</div> <div class="permIcon" data-permission="private">
<h4>PUBLIC</h4> <div id="newmap_pr" class="mapPrivateIcon mapPermIcon">
</div> <div class="tip">
<div class="permIcon" data-permission="private"> Only you can view or edit this map.
<div class="mapPrivateIcon mapPermIcon hoverForTip"> </div>
<div class="tip"> </div>
Only you can view or edit this map. <h4>PRIVATE</h4>
</div> </div>
</div> <div class="clearfloat"></div>
<h4>PRIVATE</h4>
</div> </div>
<p class="permText">Collaborate with other mappers on editing this map. Those without accounts can view this map.</p>
<div class="clearfloat"></div> <div class="clearfloat"></div>
</div> </div>
<p class="permText">*new topics and synapses take on the same permission as the map they are created on</p>
<div class="buttonWrapper"> <div class="buttonWrapper">
<button class="button cancel">Cancel</button> <button class="button cancel">Cancel</button>