readded panel for map container, but disable panels for geographical

entities always until we can redraw the map after panel activation
Guite · Feb 22, 2013 · 92e5e73 · 92e5e73
1 parent efbf4c9
commit 92e5e73
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/...c/org/zikula/modulestudio/generator/cartridges/zclassic/view/formcomponents/Section.xtend b/...c/org/zikula/modulestudio/generator/cartridges/zclassic/view/formcomponents/Section.xtend
@@ -36,7 +36,12 @@ class Section {
 
     def private extensionsAndRelations(Entity it, Application app, Controller controller, IFileSystemAccess fsa) '''
         «IF geographical»
+            «IF useGroupingPanels('edit')»
+            <h3 class="«app.appName.formatForDB»map z-panel-header z-panel-indicator z-pointer">{gt text='Map'}</h3>
+            <fieldset class="«app.appName.formatForDB»map z-panel-content" style="display: none">
+            «ELSE»
             <fieldset class="«app.appName.formatForDB»map">
+            «ENDIF»
                 <legend>{gt text='Map'}</legend>
                 <div id="mapcontainer" class="«app.appName.toLowerCase»mapcontainer">
                 </div>

diff --git a/...erator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/Display.xtend b/...erator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/Display.xtend
@@ -243,7 +243,12 @@ class Display {
 
     def private displayExtensions(Entity it, Controller controller, String objName) '''
         «IF geographical»
-            <h3 class="«container.application.appName.formatForDB»map">{gt text='Map'}</h3>
+            «IF useGroupingPanels('display')»
+                <h3 class="«container.application.appName.formatForDB»map z-panel-header z-panel-indicator z-pointer">{gt text='Map'}</h3>
+                <div class="«container.application.appName.formatForDB»map z-panel-content" style="display: none">
+            «ELSE»
+                <h3 class="«container.application.appName.formatForDB»map">{gt text='Map'}</h3>
+            «ENDIF»
             {pageaddvarblock name='header'}
                 <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
                 <script type="text/javascript" src="{$baseurl}plugins/Mapstraction/lib/vendor/mxn/mxn.js?(googlev3)"></script>

diff --git a/...ulestudio.generator/src/org/zikula/modulestudio/generator/extensions/ViewExtensions.xtend b/...ulestudio.generator/src/org/zikula/modulestudio/generator/extensions/ViewExtensions.xtend
@@ -35,7 +35,8 @@ class ViewExtensions {
      * @return Boolean The result.
      */
     def useGroupingPanels(Entity it, String page) {
-        (panelWeight(page) > 3)
+        // return false for geographical always until we can redraw the map after panel activation
+        (!geographical && panelWeight(page) > 3)
     }
 
     /**