Permalink
Browse files

fixes for notices, links to cards w colons in name, and conflicts

  • Loading branch information...
1 parent 1dba9e8 commit f7ede5015471a222f997b378359519bc2256beeb @ethn ethn committed Apr 2, 2013
@@ -33,8 +33,11 @@ jQuery.fn.extend {
v
notify: (message) ->
- notice = @slot().find '.card-notice'
- return false unless notice[0]
+ slot = @slot()
+ notice = slot.find '.card-notice'
+ unless notice[0]
+ notice = $('<div class="card-notice"></div>')
+ slot.append notice
notice.html message
notice.show 'blind'
@@ -473,13 +473,15 @@ body#wagn .card-slot.recent-changes h2 {
a.missing-labeled,
.labeled-view label {
display: inline-block;
- min-width: 20%;
+ min-width: 30%;
text-align: right;
}
.labeled-view label h1,
.labeled-view .pointer-list,
-.labeled-view .pointer-item {
+.labeled-view .pointer-item,
+.labeled-view .search-result-list,
+.labeled-view .search-result-item {
display: inline;
}
View
@@ -124,8 +124,6 @@ def get_type_id args={}
when :noop
when false, nil
errors.add :type, "#{args[:type] || args[:typecode]} is not a known type."
- @error_view = :not_found
- @error_status = 404
else
return type_id
end
@@ -36,7 +36,7 @@ def update_references rendered_content = nil, refresh = false
expire if refresh
rendered_content ||= ObjectContent.new(content, {:card=>self} )
-
+
rendered_content.find_chunks(Chunks::Reference).each do |chunk|
if referee_name = chunk.referee_name # name is referenced (not true of commented inclusions)
referee_id = chunk.referee_id
View
@@ -27,7 +27,7 @@ def initialize match, card_params, params
end
@link_text = objectify @link_text
- if target =~ /[\/:]/
+ if target =~ /\/|mailto:/
@explicit_link = objectify target
else
@name = target
@@ -249,10 +249,9 @@ def ok_view view, args={}
if view != original_view
args[:denied_view] = original_view
-
- if focal? && error_code = @@error_codes[view]
- root.error_status = error_code
- end
+ end
+ if focal? && error_code = @@error_codes[view]
+ root.error_status = error_code
end
#warn "ok_view[#{original_view}] #{view}, #{args.inspect}, Cd:#{card.inspect}" #{caller[0..20]*"\n"}"
view
@@ -41,7 +41,6 @@ module Set::All::RichHtml
#{ _render_header args.merge( :menu_default_hidden=>true ) }
#{ wrap_content( :titled, :body=>true ) { _render_core args } }
#{ optional_render :comment_box, args }
- #{ notice }
}
end
end
@@ -87,7 +86,6 @@ module Set::All::RichHtml
#{ _render_header args }
#{ wrap_content( :open, :body=>true ) { _render_open_content args } }
#{ render_comment_box }
- #{ notice }
}
end
end
@@ -225,7 +223,6 @@ module Set::All::RichHtml
</div>
</fieldset>
</div>
- #{ notice }
}
end
end)
@@ -267,7 +264,6 @@ module Set::All::RichHtml
end
end
}
- #{ notice }
}
end
end
@@ -390,7 +386,6 @@ module Set::All::RichHtml
</table>}
end }
</div>
- #{ notice }
}
end
end
@@ -412,7 +407,6 @@ module Set::All::RichHtml
end
}
</div>
- #{ notice }
}
end
end
@@ -476,7 +470,6 @@ module Set::All::RichHtml
}
end
}
- #{ notice }
}
end
end
@@ -42,7 +42,7 @@ module Set::Type::Setting
klasses.map do |klass, rules|
%{
<tr class="klass-row anchorless-#{ klass.anchorless? }">
- <td class="setting-klass">#{ klass.key_name }</td>
+ <td class="setting-klass">#{ klass.anchorless? ? link_to_page( klass.key_name ) : klass.key_name }</td>
<td class="rule-content-container">
<span class="closed-content content">#{ subrenderer(rules[0])._render_closed_content if klass.anchorless? }</span>
</td>

0 comments on commit f7ede50

Please sign in to comment.