Merge remote-tracking branch 'ethan/develop' into develop

app/assets/javascripts/wagn_pack.js.coffee

@@ -112,11 +112,6 @@ $(window).ready ->
   $('.ui-menu-icon').live 'tap', (event)->
     $(this).closest('li').trigger('mouseenter')
     event.preventDefault()
-
-
-
-#    alert('prevented?')
-    #wagn.openMenu this
 
 
   #pointer pack
@@ -146,10 +141,6 @@ $(window).ready ->
     slot.find('.perm-group input:checked').attr('checked', false)
     slot.find('.perm-indiv input').val('')
 
-  #wagn_org pack (for now)
-  $('.shade-view h1').live 'click', ->
-    $(this).slot().find('.shade-content').slideToggle 1000
-
   # rstar pack
   $('body').delegate '.rule-submit-button', 'click', ->
     f = $(this).closest('form')
@@ -178,10 +169,25 @@ $(window).ready ->
        $(wagn.padform)[0].submit()
     false
 
+  #wagn_org pack (for now)
+  $('.shade-view h1').live 'click', ->
+    toggleThis = $(this).slot().find('.shade-content').is ':hidden'
+    toggleShade $(this).closest('.pointer-list').find('.shade-content:visible').parent()
+    if toggleThis
+      toggleShade $(this).slot()
+
+
+  if firstShade = $('.shade-view h1')[0]
+    $(firstShade).trigger 'click'
+
+
 $(document).bind 'mobileinit', ->
   $.mobile.autoInitializePage = false
   $.mobile.ajaxEnabled = false
-
+
+toggleShade = (shadeSlot) ->
+  shadeSlot.find('.shade-content').slideToggle 1000
+  shadeSlot.find('.ui-icon').toggleClass 'ui-icon-triangle-1-e ui-icon-triangle-1-s'  
 
 permissionsContent = (ed) ->
   return '_left' if ed.find('#inherit').attr('checked')
@@ -249,3 +255,5 @@ navbox_select = (event, ui) ->
     window.location = wagn.rootPath + ui.item.href
 
   $(this).attr('disabled', 'disabled')
+
+

public/assets/manifest.yml

@@ -61,8 +61,8 @@ wait.gif: wait-fcacc98c2777bec05f82da6258e1378b.gif
 wait/index.gif: wait-fcacc98c2777bec05f82da6258e1378b.gif
 wait_lg.gif: wait_lg-397bf884dd6fafbdd31e51c0f7c328d3.gif
 wait_lg/index.gif: wait_lg-397bf884dd6fafbdd31e51c0f7c328d3.gif
-application.js: application-22f43018efeed57b91185ae107020c52.js
-application/index.js: application-22f43018efeed57b91185ae107020c52.js
+application.js: application-b6a7998d3ce329e5cc21c712cff0cca2.js
+application/index.js: application-b6a7998d3ce329e5cc21c712cff0cca2.js
 application-all.css: application-all-08d99b895fb180eba1c44ce06f328e78.css
 application-all/index.css: application-all-08d99b895fb180eba1c44ce06f328e78.css
 application-print.css: application-print-2ab614fbd34fa2be0e616bbdf0d2318b.css