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

made a few more detaily fixes

Browse source
This commit is contained in:
Devin Howard 2013-01-02 23:01:38 -05:00
parent 4ea435dfee
commit 9f9061d908
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/Jit/graphsettings.js
View file

@ -548,8 +548,7 @@ function onCreateLabelHandler(domElement, node) {
data-url="/topics/$_id_$" \ data-url="/topics/$_id_$" \
data-object="topic" \ data-object="topic" \
data-attribute="name" \ data-attribute="name" \
data-type="input"> \ data-type="input">$_name_$</span> \
$_name_$</span> \
<a href="/topics/$_id_$" target="_blank"> \ <a href="/topics/$_id_$" target="_blank"> \
<img class="topic-go-arrow" \ <img class="topic-go-arrow" \
title="Go to the topic page" \ title="Go to the topic page" \
@ -564,6 +563,7 @@ function onCreateLabelHandler(domElement, node) {
id="best_in_place_desc" \ id="best_in_place_desc" \
data-url="/topics/$_id_$" \ data-url="/topics/$_id_$" \
data-object="topic" \ data-object="topic" \
data-nil="$_desc_nil_$" \
data-attribute="desc" \ data-attribute="desc" \
data-type="textarea">$_desc_$</span> \ data-type="textarea">$_desc_$</span> \
</div> \ </div> \
@ -609,11 +609,15 @@ function onCreateLabelHandler(domElement, node) {
html = html.replace(/\$_name_\$/g, node.name); html = html.replace(/\$_name_\$/g, node.name);
html = html.replace(/\$_userid_\$/g, node.getData("userid")); html = html.replace(/\$_userid_\$/g, node.getData("userid"));
html = html.replace(/\$_username_\$/g, node.getData("username")); html = html.replace(/\$_username_\$/g, node.getData("username"));
var desc_nil = "<span class='gray'>Click to add description.</span>";
html = html.replace(/\$_desc_nil_\$/g, desc_nil);
if (node.getData("desc") == "") { if (node.getData("desc") == "") {
html = html.replace(/\$_desc_\$/g, '<span style="color: #cccccc">Click to add description.</span>'); html = html.replace(/\$_desc_\$/g, desc_nil);
} else { } else {
html = html.replace(/\$_desc_\$/g, node.getData("desc")); html = html.replace(/\$_desc_\$/g, node.getData("desc"));
} }
html = html.replace(/\$_link_\$/g, node.getData("link")); html = html.replace(/\$_link_\$/g, node.getData("link"));
html = html.replace(/\$_metacode_choices_\$/g, metacode_choices); html = html.replace(/\$_metacode_choices_\$/g, metacode_choices);

4
app/assets/stylesheets/topics.css.scss
View file

@ -43,3 +43,7 @@ line-height: 24px;}
height: 1em; height: 1em;
float: right; float: right;
} }
.gray {
color: #999999;
}

3
app/views/topics/_topic.html.erb
View file

@ -7,4 +7,5 @@
<div class="desc"><p><%=topic.desc %></p></div> <div class="desc"><p><%=topic.desc %></p></div>
</div> </div>
<%= link_to topic.link, topic.link, :class => 'link', :target => '_blank' %> <%= link_to topic.link, topic.link, :class => 'link', :target => '_blank' %>
<% end %> <%= best_in_place topic, :name, :nil => 'lol' %>
<% end %>