diff options
author | Uģis Ozols <ugis.ozolss@gmail.com> | 2011-08-03 13:17:16 +0300 |
---|---|---|
committer | Uģis Ozols <ugis.ozolss@gmail.com> | 2011-08-03 13:17:16 +0300 |
commit | 476ad3f15810455fd40cc8374af1a253471b296c (patch) | |
tree | c3cc8e7993364f7d0fb9362cf6c0bc6e99873e44 /app/views | |
parent | 806aef18583a4fcdc5a88a6e2acfe6b779abea4c (diff) | |
download | refinerycms-blog-476ad3f15810455fd40cc8374af1a253471b296c.tar.gz refinerycms-blog-476ad3f15810455fd40cc8374af1a253471b296c.tar.bz2 refinerycms-blog-476ad3f15810455fd40cc8374af1a253471b296c.zip |
WIP - use asset pipeline.
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/refinery/admin/blog/_submenu.html.erb | 2 | ||||
-rw-r--r-- | app/views/refinery/admin/blog/comments/show.html.erb | 2 | ||||
-rw-r--r-- | app/views/refinery/admin/blog/posts/_form.css.erb | 20 | ||||
-rw-r--r-- | app/views/refinery/admin/blog/posts/_form.html.erb | 4 | ||||
-rw-r--r-- | app/views/refinery/admin/blog/posts/_form.js.erb | 23 | ||||
-rw-r--r-- | app/views/refinery/blog/categories/show.html.erb | 2 | ||||
-rw-r--r-- | app/views/refinery/blog/posts/archive.html.erb | 2 | ||||
-rw-r--r-- | app/views/refinery/blog/posts/index.html.erb | 2 | ||||
-rw-r--r-- | app/views/refinery/blog/posts/show.html.erb | 4 | ||||
-rw-r--r-- | app/views/refinery/blog/posts/tagged.html.erb | 2 | ||||
-rw-r--r-- | app/views/refinery/shared/admin/_autocomplete.html.erb | 52 |
11 files changed, 11 insertions, 104 deletions
diff --git a/app/views/refinery/admin/blog/_submenu.html.erb b/app/views/refinery/admin/blog/_submenu.html.erb index 442ab47..799c101 100644 --- a/app/views/refinery/admin/blog/_submenu.html.erb +++ b/app/views/refinery/admin/blog/_submenu.html.erb @@ -93,4 +93,4 @@ </nav> -<% content_for :stylesheets, stylesheet_link_tag('refinery/refinerycms-blog')%> +<% content_for :stylesheets, stylesheet_link_tag('refinery/blog/backend') %> diff --git a/app/views/refinery/admin/blog/comments/show.html.erb b/app/views/refinery/admin/blog/comments/show.html.erb index d4c2186..2e72eb0 100644 --- a/app/views/refinery/admin/blog/comments/show.html.erb +++ b/app/views/refinery/admin/blog/comments/show.html.erb @@ -60,4 +60,4 @@ </table> </div> -<% content_for :stylesheets, stylesheet_link_tag('refinery/refinerycms-blog') %> +<% content_for :stylesheets, stylesheet_link_tag('refinery/blog/backend') %> diff --git a/app/views/refinery/admin/blog/posts/_form.css.erb b/app/views/refinery/admin/blog/posts/_form.css.erb deleted file mode 100644 index 869ab9b..0000000 --- a/app/views/refinery/admin/blog/posts/_form.css.erb +++ /dev/null @@ -1,20 +0,0 @@ -<style type='text/css'> - ul.blog_categories{ - height:200px; - overflow:auto; - border:1px solid #ccc; - padding:5px; - } - ul.blog_categories, ul.blog_categories li { - list-style: none; - margin:5px 0; - } - a#copy_body_link { - background: url("/images/refinery/icons/add.png") no-repeat scroll 0 6px transparent; - border-bottom: 0 none; - display: inline; - line-height: 29px; - margin-top: 0; - padding-left: 20px; - } -</style> diff --git a/app/views/refinery/admin/blog/posts/_form.html.erb b/app/views/refinery/admin/blog/posts/_form.html.erb index f8c6ba3..8a3b091 100644 --- a/app/views/refinery/admin/blog/posts/_form.html.erb +++ b/app/views/refinery/admin/blog/posts/_form.html.erb @@ -103,6 +103,6 @@ } %> <% end -%> -<% content_for :stylesheets, render(:partial => 'form.css') -%> -<% content_for :javascripts, render(:partial => 'form.js') -%> +<% content_for :stylesheets, stylesheet_link_tag('refinery/blog/backend') %> +<% content_for :javascripts, javascript_include_tag('refinery/blog/backend') %> <%= render 'refinery/shared/admin/autocomplete', :dom_id => '#blog_post_tag_list', :url => main_app.tags_refinery_admin_blog_posts_url %> diff --git a/app/views/refinery/admin/blog/posts/_form.js.erb b/app/views/refinery/admin/blog/posts/_form.js.erb deleted file mode 100644 index 87ad23f..0000000 --- a/app/views/refinery/admin/blog/posts/_form.js.erb +++ /dev/null @@ -1,23 +0,0 @@ -<script> - (function($) { - $(function() { - $('#page-tabs').tabs(); - $('#copy_body_link').click(function(event) { - // Find the WYMEditor that maps to the custom_teaser field - var teaserTextArea = $('#blog_post_custom_teaser')[0]; - var teaserEditor = null; - $.each(WYMeditor.INSTANCES, function(index, editor) { - if (editor._element[0] == teaserTextArea) { - teaserEditor = editor; - } - }); - - if (teaserEditor) { - teaserEditor.html($('#blog_post_body').attr('value')); - } - - event.preventDefault(); - }); - }); - })(jQuery); -</script> diff --git a/app/views/refinery/blog/categories/show.html.erb b/app/views/refinery/blog/categories/show.html.erb index a31c85b..1ae938f 100644 --- a/app/views/refinery/blog/categories/show.html.erb +++ b/app/views/refinery/blog/categories/show.html.erb @@ -18,4 +18,4 @@ <% end %> <%= render :partial => "/refinery/content_page" %> -<% content_for :stylesheets, stylesheet_link_tag('refinerycms-blog') %> +<% content_for :stylesheets, stylesheet_link_tag('refinery/blog/frontend') %> diff --git a/app/views/refinery/blog/posts/archive.html.erb b/app/views/refinery/blog/posts/archive.html.erb index ca12383..c7a2c92 100644 --- a/app/views/refinery/blog/posts/archive.html.erb +++ b/app/views/refinery/blog/posts/archive.html.erb @@ -12,4 +12,4 @@ <%= render :partial => '/refinery/blog/shared/body_content_right' %> <%= render :partial => "/refinery/content_page" %> -<% content_for :stylesheets, stylesheet_link_tag('refinerycms-blog') %> +<% content_for :stylesheets, stylesheet_link_tag('refinery/blog/frontend') %> diff --git a/app/views/refinery/blog/posts/index.html.erb b/app/views/refinery/blog/posts/index.html.erb index c6ca75a..f347af1 100644 --- a/app/views/refinery/blog/posts/index.html.erb +++ b/app/views/refinery/blog/posts/index.html.erb @@ -17,4 +17,4 @@ <%= render :partial => '/refinery/blog/shared/body_content_right' %> <%= render :partial => "/refinery/content_page" %> -<% content_for :stylesheets, stylesheet_link_tag('refinerycms-blog') %> +<% content_for :stylesheets, stylesheet_link_tag('refinery/blog/frontend') %> diff --git a/app/views/refinery/blog/posts/show.html.erb b/app/views/refinery/blog/posts/show.html.erb index 3670bf1..3f5cf07 100644 --- a/app/views/refinery/blog/posts/show.html.erb +++ b/app/views/refinery/blog/posts/show.html.erb @@ -12,11 +12,11 @@ <%= render :partial => "/refinery/content_page", :locals => { :remove_automatic_sections => true } %> -<% content_for :stylesheets, stylesheet_link_tag('refinerycms-blog') %> +<% content_for :stylesheets, stylesheet_link_tag('refinery/blog/frontend') %> <% content_for :before_javascript_libraries, jquery_include_tags(:jquery_ui => false) %> <% content_for :javascripts do %> <%# enable AJAX'd post nav at your own risk until html5 history API implemented. %> - <%#= javascript_include_tag('refinerycms-blog') %> + <%#= javascript_include_tag('refinery/blog/frontend') %> <script src="http://w.sharethis.com/button/buttons.js"></script> <script>stLight.options({publisher:'<%= BlogPost::ShareThis.key %>'});</script> <% end if Refinery::BlogPost::ShareThis.enabled? %> diff --git a/app/views/refinery/blog/posts/tagged.html.erb b/app/views/refinery/blog/posts/tagged.html.erb index f116732..860bd72 100644 --- a/app/views/refinery/blog/posts/tagged.html.erb +++ b/app/views/refinery/blog/posts/tagged.html.erb @@ -14,4 +14,4 @@ <%= render :partial => '/refinery/blog/shared/body_content_right' %> <%= render :partial => "/refinery/content_page" %> -<% content_for :stylesheets, stylesheet_link_tag('refinerycms-blog') %> +<% content_for :stylesheets, stylesheet_link_tag('refinery/blog/frontend') %> diff --git a/app/views/refinery/shared/admin/_autocomplete.html.erb b/app/views/refinery/shared/admin/_autocomplete.html.erb index b4898cc..bf495e0 100644 --- a/app/views/refinery/shared/admin/_autocomplete.html.erb +++ b/app/views/refinery/shared/admin/_autocomplete.html.erb @@ -1,55 +1,5 @@ -<% content_for :stylesheets, stylesheet_link_tag("ui-lightness/jquery-ui-1.8.13.custom.css") -%> +<% content_for :stylesheets, stylesheet_link_tag("refinery/blog/ui-lightness/jquery-ui-1.8.13.custom") %> <% content_for :javascripts do %> <%= javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js" %> - <script> - function split( val ) { - return val.split( /,\s*/ ); - } - function extractLast( term ) { - return split( term ).pop(); - } - - - $(document).ready(function(){ - page_options.init(false, '', '') - - $('<%= dom_id %>') - .bind( "keydown", function( event ) { - if ( event.keyCode === $.ui.keyCode.TAB && - $( this ).data( "autocomplete" ).menu.active ) { - event.preventDefault() - } - }) - .autocomplete({ - source: function( request, response ) { - $.getJSON( "<%= url %>", { - term: extractLast( request.term ) - }, response ); - }, - search: function() { - // custom minLength - var term = extractLast( this.value ); - if ( term.length < 2 ) { - return false; - } - }, - focus: function() { - // prevent value inserted on focus - return false; - }, - select: function( event, ui ) { - var terms = split( this.value ); - // remove the current input - terms.pop(); - // add the selected item - terms.push( ui.item.value ); - // add placeholder to get the comma-and-space at the end - terms.push( "" ); - this.value = terms.join( ", " ); - return false; - } - }) - }); - </script> <% end %>
\ No newline at end of file |