jro_apps/redmine Commit - r482:5db3396c07b2

Added an ajax indicator for all ajax calls. Also removed highlight effects on my page layout edition....

Jean-Philippe Lang -

r482:5db3396c07b2

parent child

Context file:

r482:5db3396c07b2

Collapse all files

app/views/layouts/base.rhtml +4 0

             		<%= yield %>
             	</div>
+            	<div id="ajax-indicator" style="display:none;">
+            	   <span><%= l(:label_loading) %></span>
+            	</div>
             	<div id="footer">
             		<p><a href="http://redmine.rubyforge.org/">redMine</a> <small><%= Redmine::VERSION %> &copy 2006-2007 Jean-Philippe Lang</small></p>
             	</div>

app/views/my/_block.rhtml +1 -3

                 <div style="float:right;margin-right:16px;z-index:500;">
                 <%= link_to_remote "", {
                     :url => { :action => "remove_block", :block => block_name },
-                    :complete => "removeBlock('block_#{block_name}')",
+                    :complete => "removeBlock('block_#{block_name}')" },
-                    :loading => "Element.show('indicator')",
-                    :loaded => "Element.hide('indicator')" },
                     :class => "close-icon"
                      %>
                 </div>

app/views/my/page_layout.rhtml +9 -19

                 Sortable.destroy('list-left');
                 Sortable.destroy('list-right');
-            	Sortable.create("list-top", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('/my/order_blocks?group=top', {asynchronous:true, evalScripts:true, onComplete:function(request){new Effect.Highlight("list-top",{});}, onLoaded:function(request){Element.hide('indicator')}, onLoading:function(request){Element.show('indicator')}, parameters:Sortable.serialize("list-top")})}, only:'mypage-box', tag:'div'})
+            	Sortable.create("list-top", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('/my/order_blocks?group=top', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-top")})}, only:'mypage-box', tag:'div'})
-            	Sortable.create("list-left", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('/my/order_blocks?group=left', {asynchronous:true, evalScripts:true, onComplete:function(request){new Effect.Highlight("list-left",{});}, onLoaded:function(request){Element.hide('indicator')}, onLoading:function(request){Element.show('indicator')}, parameters:Sortable.serialize("list-left")})}, only:'mypage-box', tag:'div'})
+            	Sortable.create("list-left", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('/my/order_blocks?group=left', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-left")})}, only:'mypage-box', tag:'div'})
-            	Sortable.create("list-right", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('/my/order_blocks?group=right', {asynchronous:true, evalScripts:true, onComplete:function(request){new Effect.Highlight("list-right",{});}, onLoaded:function(request){Element.hide('indicator')}, onLoading:function(request){Element.show('indicator')}, parameters:Sortable.serialize("list-right")})}, only:'mypage-box', tag:'div'})
+            	Sortable.create("list-right", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('/my/order_blocks?group=right', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-right")})}, only:'mypage-box', tag:'div'})
             }
             function updateSelect() {
             </script>
             <div class="contextual">
-            <span id="indicator" style="display:none"><%= image_tag "loading.gif", :align => "absmiddle" %></span>
             <% form_tag({:action => "add_block"}, :id => "block-form") do %>
             <%= select_tag 'block', "<option></option>" + options_for_select(@block_options), :id => "block-select" %>
             <%= link_to_remote l(:button_add),
                         :with => "Form.serialize('block-form')",
                         :update => "list-top",
                         :position => :top,
-                        :complete => "afterAddBlock();",
+                        :complete => "afterAddBlock();"
-                        :loading => "Element.show('indicator')",
-                        :loaded => "Element.hide('indicator')"
                        }, :class => 'icon icon-add'
                          %>
             <% end %>
                   :dropOnEmpty => true,
                   :containment => ['list-top', 'list-left', 'list-right'],
                   :constraint => false,
-                  :complete => visual_effect(:highlight, 'list-top'),
+                  :url => { :action => "order_blocks", :group => "top" }
-                  :url => { :action => "order_blocks", :group => "top" },
-                  :loading => "Element.show('indicator')",
-                  :loaded => "Element.hide('indicator')"
                    %>
                   :dropOnEmpty => true,
                   :containment => ['list-top', 'list-left', 'list-right'],
                   :constraint => false,
-                  :complete => visual_effect(:highlight, 'list-left'),
+                  :url => { :action => "order_blocks", :group => "left" }
-                  :url => { :action => "order_blocks", :group => "left" },
+                   %>
-                  :loading => "Element.show('indicator')",
-                  :loaded => "Element.hide('indicator')" %>
             <%= sortable_element 'list-right',
                   :tag => 'div',
                   :dropOnEmpty => true,
                   :containment => ['list-top', 'list-left', 'list-right'],
                   :constraint => false,
-                  :complete => visual_effect(:highlight, 'list-right'),
+                  :url => { :action => "order_blocks", :group => "right" }
-                  :url => { :action => "order_blocks", :group => "right" },
+                   %>
-                  :loading => "Element.show('indicator')",
-                  :loaded => "Element.hide('indicator')" %>
             <%= javascript_tag "updateSelect()" %>

app/views/wiki/edit.rhtml +2 -6

                                    { :url => { :controller => 'wiki', :action => 'preview', :id => @project, :page => @page.title },
                                      :method => 'get',
                                      :update => 'preview',
-                                     :with => "Form.serialize('wiki_form')",
+                                     :with => "Form.serialize('wiki_form')"
-                                     :loading => "Element.show('indicator')",
+                                   } %></p>
-                                     :loaded => "Element.hide('indicator')"
-                                   } %>
-               <span id="indicator" style="display:none"><%= image_tag "loading.gif", :align => "absmiddle" %></span>
-            </p>
             <% end %>

lang/de.yml +1 0

             label_watched_issues: Watched issues
             label_related_issues: Related issues
             label_applied_status: Applied status
+            label_loading: Loading...
             button_login: Einloggen
             button_submit: OK

lang/en.yml +1 0

             label_watched_issues: Watched issues
             label_related_issues: Related issues
             label_applied_status: Applied status
+            label_loading: Loading...
             button_login: Login
             button_submit: Submit

lang/es.yml +1 0

             label_watched_issues: Watched issues
             label_related_issues: Related issues
             label_applied_status: Applied status
+            label_loading: Loading...
             button_login: Conexión
             button_submit: Someter

lang/fr.yml +1 0

             label_watched_issues: Demandes surveillées
             label_related_issues: Demandes liées
             label_applied_status: Statut appliqué
+            label_loading: Chargement...
             button_login: Connexion
             button_submit: Soumettre

lang/it.yml +1 0

             label_watched_issues: Watched issues
             label_related_issues: Related issues
             label_applied_status: Applied status
+            label_loading: Loading...
             button_login: Login
             button_submit: Invia

lang/ja.yml +1 0

             label_watched_issues: Watched issues
             label_related_issues: Related issues
             label_applied_status: Applied status
+            label_loading: Loading...
             button_login: ログイン
             button_submit: 変更

lang/pt.yml +1 0

             label_watched_issues: Watched issues
             label_related_issues: Related issues
             label_applied_status: Applied status
+            label_loading: Loading...
             button_login: Login
             button_submit: Enviar

lang/zh.yml +1 0

             label_watched_issues: Watched issues
             label_related_issues: Related issues
             label_applied_status: Applied status
+            label_loading: Loading...
             button_login: 登录
             button_submit: 提交

public/javascripts/application.js +14 0

@@ -31,3 +31,17 function showTab(name) {
31	Element.addClassName('tab-' + name, "selected");	31	Element.addClassName('tab-' + name, "selected");
32	return false;	32	return false;
33	}	33	}
		34
		35	/* shows and hides ajax indicator */
		36	Ajax.Responders.register({
		37	onCreate: function(){
		38	if ($('ajax-indicator') && Ajax.activeRequestCount > 0) {
		39	Element.show('ajax-indicator');
		40	}
		41	},
		42	onComplete: function(){
		43	if ($('ajax-indicator') && Ajax.activeRequestCount == 0) {
		44	Element.hide('ajax-indicator');
		45	}
		46	}
		47	});

public/stylesheets/application.css +27 0

@@ -636,3 +636,30 div.wiki code {
636	}	636	}
637		637
638	#preview .preview { background: #fafbfc url(../images/draft.png); }	638	#preview .preview { background: #fafbfc url(../images/draft.png); }
		639
		640	#ajax-indicator {
		641	position: absolute; /* fixed not supported by IE */
		642	background-color:#eee;
		643	border: 1px solid #bbb;
		644	top:35%;
		645	left:40%;
		646	width:20%;
		647	font-weight:bold;
		648	text-align:center;
		649	padding:0.6em;
		650	z-index:100;
		651	filter:alpha(opacity=50);
		652	-moz-opacity:0.5;
		653	opacity: 0.5;
		654	-khtml-opacity: 0.5;
		655	}
		656
		657	html>body #ajax-indicator { position: fixed; }
		658
		659	#ajax-indicator span {
		660	background-position: 0% 40%;
		661	background-repeat: no-repeat;
		662	background-image: url(../images/loading.gif);
		663	padding-left: 26px;
		664	vertical-align: bottom;
		665	}

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages