Changeset 20473

Timestamp:

2011/03/03 16:35:02 (13 years ago)

Author:

kimoto

Message:

smartyのdebugコンソールが動かないのを修正
admin_modeの際に埋め込み

Location:

branches/version-2_5-dev/data

Files:

• Smarty/templates/admin/main_frame.tpl (modified) (1 diff)
• module/Smarty/libs/debug.tpl (modified) (3 diffs)

branches/version-2_5-dev/data/Smarty/templates/admin/main_frame.tpl

@@ -155 +155 @@
 
 </div>
+    <!--{if $smarty.const.ADMIN_MODE == 1}-->
+    <!--{debug output='html'}-->
+    <!--{/if}-->
 </body>
 </html>

branches/version-2_5-dev/data/module/Smarty/libs/debug.tpl

@@ -10 +10 @@
 <style type="text/css">
 /* <![CDATA[ */
-body, h1, h2, td, th, p {
-    font-family: sans-serif;
-    font-weight: normal;
-    font-size: 0.9em;
-    margin: 1px;
-    padding: 0;
-}
-
-h1 {
-    margin: 0;
-    text-align: left;
-    padding: 2px;
-    background-color: #f0c040;
-    color:  black;
-    font-weight: bold;
-    font-size: 1.2em;
- }
-
-h2 {
-    background-color: #9B410E;
-    color: white;
-    text-align: left;
-    font-weight: bold;
-    padding: 2px;
-    border-top: 1px solid black;
-}
-
-body {
-    background: black; 
-}
-
-p, table, div {
-    background: #f0ead8;
-} 
-
-p {
-    margin: 0;
-    font-style: italic;
-    text-align: center;
-}
-
-table {
-    width: 100%;
-}
-
-th, td {
-    font-family: monospace;
-    vertical-align: top;
-    text-align: left;
-    width: 50%;
-}
-
-td {
-    color: green;
-}
-
-.odd {
-    background-color: #eeeeee;
-}
-
-.even {
-    background-color: #fafafa;
-}
-
 .exectime {
     font-size: 0.8em;
@@ -101 +37 @@
     <font color={if $_debug_tpls[templates].type eq "template"}brown{elseif $_debug_tpls[templates].type eq "insert"}black{else}green{/if}>
         {$_debug_tpls[templates].filename|escape:html}</font>
-    {if isset($_debug_tpls[templates].exec_time)}
+    {if isset($_debug_tpls[templates].exec_time|smarty:nodefaults)}
         <span class="exectime">
         ({$_debug_tpls[templates].exec_time|string_format:"%.5f"})
@@ -139 +75 @@
 </html>
 {/capture}
-{if isset($_smarty_debug_output) and $_smarty_debug_output eq "html"}
+{if isset($_smarty_debug_output|smarty:nodefaults) and $_smarty_debug_output eq "html"}
     {$debug_output}
 {else}