Merge remote-tracking branch 'origin/desktop' into desktop

* origin/desktop:
  Remove Gemfile.lock
  sort conference and type
  add conferene list order function
  css minor changes.
  gridster, url code fixed, views removed.
  Fix selection of sub_menu for widget (the value wasn't set)
  Fix bug in widget selection
  css minor changes.
  Fix public_r_tag selection
  gridster, url code fixed, views removed.

app/views/admin/page_parts/_public_r_tag.html.erb

@@ -1,5 +1,5 @@
 <span id='tag_list'>
-	<%= f.select :public_r_tag, LIST[:public_r_tags].collect{|tag| [t(tag), tag]}, {:selected => @r_tag}, {:rel => admin_page_parts_path}  %>
+	<%= f.select :public_r_tag, LIST[:public_r_tags].collect{|tag| [t(tag), tag]}, {:selected => @r_tag}, {:rel => reload_r_tag_options_admin_page_part_path(@part)}  %>
 </span>
 
 <span id='name_list'>

app/views/admin/page_parts/reload_r_tag_options.js.erb

@@ -1,5 +1,8 @@
 <% if @r_tag.eql?('sub_menu') %>
 	// $('#name_list select').html("<%= j options_for_select(t(:horizontal) => :horizontal, t(:vertical) => :vertical) %>")
+  $('#name_list').html("<%= j hidden_field_tag 'page_part[public_r_tag_object_id]', @part.page.id %>")
+<% elsif @tag_objects %>
+	$('#name_list').html("<%= j select_tag 'page_part[public_r_tag_object_id]', options_from_collection_for_select(@tag_objects, :id, :title, :selected => @part.public_r_tag_object_id) %>")
 <% else %>
-	$('#name_list select').html("<%= j options_from_collection_for_select(@tag_objects, :id, :title) %>")
+  $('#name_list').empty()
 <% end %>