Changeset 8012 for trunk/plugins/admin_multi_view

Timestamp:

Dec 6, 2010, 9:52:44 PM (13 years ago)

Author:

rvelices

Message:

combined script now really merges files
added option $conftemplate_combine_files by default true to enable/disable file combining

Location:

trunk/plugins/admin_multi_view

Files:

• controller.php (modified) (4 diffs)
• is_admin.inc.php (modified) (1 diff)

trunk/plugins/admin_multi_view/controller.php

@@ -12 +12 @@
   pwg_unset_session_var( 'multiview_debug_l10n' );
   pwg_unset_session_var( 'multiview_debug_template' );
+        pwg_unset_session_var( 'multiview_template_combine_files' );
   pwg_unset_session_var( 'multiview_no_history' );
 ?>
@@ -85 +86 @@
   $refresh_main = true;
 }
+
+if ( isset($_GET['template_combine_files']) )
+{
+  if ( $_GET['template_combine_files']==0 )
+    pwg_set_session_var( 'multiview_template_combine_files', 0 );
+  else
+    pwg_unset_session_var( 'multiview_template_combine_files' );
+  $refresh_main = true;
+}
+
 
 if ( isset($_GET['no_history']) )
@@ -195 +206 @@
 
 // +-----------------------------------------------------------------------+
+// | template combine files                                                |
+$template_combine_files_html='';
+if ($conf['template_combine_files'])
+{
+  if ( pwg_get_session_var( 'multiview_template_combine_files', 1 ) )
+    $template_combine_files_html.='<a href="'.$my_url.'?template_combine_files=0">Don\'t combine js&amp;css</a>';
+  else
+    $template_combine_files_html.='<a href="'.$my_url.'?template_combine_files=1">Combine js&amp;css</a>';
+}
+
+// +-----------------------------------------------------------------------+
 // | no history                                                            |
 $no_history_html='';
@@ -225 +247 @@
 <tr><td>Lang</td><td><?php echo $lang_html; ?></td></tr>
 </table>
-<?php echo implode( "<br/>\n", array($show_queries_html, $debug_l10n_html, $debug_template_html, $no_history_html) ); ?>
+<?php echo implode( "<br/>\n", array($show_queries_html, $debug_l10n_html, $debug_template_html, $template_combine_files_html, $no_history_html) ); ?>
 
 <script type="text/javascript">

trunk/plugins/admin_multi_view/is_admin.inc.php

@@ -26 +26 @@
   if (pwg_get_session_var( 'multiview_debug_template', 0 ))
     $conf['debug_template'] = true;
-  if (pwg_get_session_var( 'multiview_no_history', 0 ))
+  if (!pwg_get_session_var( 'multiview_template_combine_files', 1 ))
+    $conf['template_combine_files'] = false;
+                if (pwg_get_session_var( 'multiview_no_history', 0 ))
   {
     add_event_handler( 'pwg_log_allowed', create_function( '', 'return false;' ) );