Changeset 1369

Timestamp:

05/15/06 23:26:59 (3 years ago)

Author:

pookey

Message:

pookey: merging trunk r1368 to my branch

Files:

• branches/pookey/data/generator/sfPropelAdmin/default/template/actions/actions.class.php (modified) (2 diffs)
• branches/pookey/data/web/sf/css/sf_admin/main.css (modified) (2 diffs)
• branches/pookey/data/web/sf/css/sf_web_debug/main.css (modified) (10 diffs)
• branches/pookey/data/web/sf/images/sf_admin/reset.png (copied) (copied from trunk/data/web/sf/images/sf_admin/reset.png)
• branches/pookey/data/web/sf/images/sf_admin/tick.png (copied) (copied from trunk/data/web/sf/images/sf_admin/tick.png)
• branches/pookey/data/web/sf/js/sf_web_debug/main.js (modified) (1 diff)
• branches/pookey/doc/book/content/cache.txt (modified) (1 diff)
• branches/pookey/doc/book/content/view.txt (modified) (1 diff)
• branches/pookey/lib/debug/sfWebDebug.class.php (modified) (8 diffs)
• branches/pookey/lib/exception/sfException.class.php (modified) (1 diff)
• branches/pookey/lib/generator/sfPropelAdminGenerator.class.php (modified) (4 diffs)
• branches/pookey/lib/validator/sfFileValidator.class.php (modified) (1 diff)

branches/pookey/data/generator/sfPropelAdmin/default/template/actions/actions.class.php

@@ -155 +155 @@
-    if (!$this->getRequest()->hasErrors() && $this->getRequest()->getFileSize('<?php echo $this->getSingularName() ?>[<?php echo $name ?>]'))
-    {
-
+if ($type != CreoleTypes::BOOLEAN)
-    if (isset($<?php echo $this->getSingularName() ?>['<?php echo $name ?>']))
-    {
@@ -179 +179 @@
-      }
-<?php elseif ($type == CreoleTypes::BOOLEAN): ?>
-  
+
-<?php else: ?>
-      $this-><?php echo $this->getSingularName() ?>->set<?php echo $column->getPhpName() ?>($<?php echo $this->getSingularName() ?>['<?php echo $name ?>']);
-<?php endif; ?>
-
+
+
+
-<?php if ($credentials): ?>
-      }

branches/pookey/data/web/sf/css/sf_admin/main.css

@@ -44 +44 @@
-  margin: 8px 0;
-  padding: 3px;
-5
+0
-  color: #555;
-
-
-
-
+
+
-}
-
@@ -253 +251 @@
-.sf_admin_action_reset_filter
-{
-cancel
+reset
-  border-right: 4px solid #E75C58 !important;
-}

branches/pookey/data/web/sf/css/sf_web_debug/main.css

@@ -14 +14 @@
-  text-decoration: none;
-  border: none;
-#eee
+transparent
-  color: #000;
-}
@@ -25 +25 @@
-#sfWebDebugBar
-{
-fixed
+absolute
-  margin: 0;
-  padding: 1px 0;
@@ -33 +33 @@
-  filter: alpha(opacity:80);
-  z-index: 10000;
-
-
-
-
-
-
+
+
+
+
+
-}
-
@@ -56 +55 @@
-  display: inline;
-  list-style: none;
+  margin: 0;
-  padding: 0 5px;
-  border-right: 1px solid #aaa;
@@ -62 +62 @@
-#sfWebDebugBar .menu li.last
-{
-
-
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -132 +140 @@
-  display: inline;
-  list-style: none;
+  margin: 0;
-  padding: 0 5px;
-  border-right: 1px solid #aaa;
@@ -149 +158 @@
-  list-style: none;
-  display: inline;
+  margin: 0;
-  padding: 0 5px;
-  border-right: 1px solid #aaa;
@@ -155 +165 @@
-#sfWebDebugConfigSummary li.last
-{
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-{
-  background-color: orange;
-}
-
-
+
-{
-  background-color: #f99;
@@ -203 +214 @@
-  border: 0;
-  width: 100%;
-}
-
-#sfWebDebugLogs tr
-{
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-
-#sfWebDebugLogs td
-{
-  margin: 0;
-  border: 0;
-  padding: 1px 3px;
-  font-family: Arial;
-  font-size: 11px;
+}
+
+#sfWebDebugLogs tr
+{
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+
+#sfWebDebugLogs td
+{
+  margin: 0;
+  border: 0;
+  padding: 1px 3px;
-  vertical-align: top;
-  background-color: #ddd;
-}
-
@@ -228 +238 @@
-  border: 0;
-  padding: 1px 3px;
-  font-family: Arial;
-  font-size: 11px;
-  vertical-align: top;
-666
+999
-  color: #eee;
-}

branches/pookey/data/web/sf/js/sf_web_debug/main.js

@@ -39 +39 @@
-    document.getElementById('sfWebDebugLog').style.display = 'none';
-    document.getElementById('sfWebDebugConfig').style.display = 'none';
+    document.getElementById('sfWebDebugDatabaseDetails').style.display = 'none';
-  }
-

branches/pookey/doc/book/content/cache.txt

@@ -96 +96 @@
-Now all the templates using this partial won't actually execute the PHP code of the partial, but use the cached version instead. 
-
-
+l
-
-Just like for actions, partial caching is also relevant when the result of the partial depends on parameters:

branches/pookey/doc/book/content/view.txt

@@ -377 +377 @@
-    [php]
-    ...
-#
+
-      <?php include_component_slot('sidebar') ?>
-    </div> 

branches/pookey/lib/debug/sfWebDebug.class.php

@@ -167 +167 @@
-
-    // max priority
-log_image
+max_priority
-    if ($sf_logging_active = sfConfig::get('sf_logging_active'))
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    if ($sf_logging_active)
-    {
- = '<table id="sfWebDebugLogs">';
-$logs .= "
-
-
-
-
-
-</tr>
+= '<table id="sfWebDebugLogs">
+  
+  
+  
+  
+  
+  
+  </tr>'."
-      $line_nb = 0;
-      foreach($this->log as $logEntry)
@@ -199 +190 @@
-        $log = $logEntry->getMessage();
-
-
+
+
+
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        }
-
@@ -231 +212 @@
-        $log = $this->formatLogLine($type, $log);
-
+        // sql queries log
+        if (preg_match('/executeQuery.+?\:\s+(.+)$/', $log, $match))
+        {
+          $sql_logs[] .= $match[1]."\n";
+        }
+
-        ++$line_nb;
-        $logs .= sprintf("<tr class='sfWebDebugLogLine sfWebDebug%s %s'><td>%s</td><td>%s</td><td>+%s&nbsp;</td><td><span class=\"sfWebDebugLogType\">%s</span></td><td>%s%s</td></tr>\n", ucfirst($priority), $logEntry->getType(), $line_nb, image_tag($this->base_image_path.'/'.$priority.'.png'), $logEntry->getElapsedTime(), $type, $log, $debug_info);
@@ -256 +243 @@
-    if (sfConfig::get('sf_logging_active'))
-    {
-
+document.getElementById(\'sfWebDebugDatabaseDetails\').style.display=\'none\';
-    }
-
-    // database information
-    $dbInfo = '';
+    $dbInfoDetails = '';
-    if (null !== ($nb = $this->getDatabaseRequestNumber()))
-    {
-
+
+
+
+
+
+
+
-    }
-
@@ -309 +303 @@
-    $result .= '
-    <div id="sfWebDebug">
-
+ class="sfWebDebug'.ucfirst($max_priority).'"
-        <a href="#" onclick="sfWebDebugToggleMenu()"><img src="'.$this->base_image_path.'/sf.png" /></a>
-        <ul id="sfWebDebugDetails" class="menu">
-
+document.getElementById(\'sfWebDebugDatabaseDetails\').style.display=\'none\';
-          '.$cacheLink.'
-          '.$logLink.'
@@ -330 +324 @@
-      <h1>Configuration and request variables</h1>
-      '.$this->getCurrentConfigAsHtml().'
+      </div>
+
+      <div id="sfWebDebugDatabaseDetails" class="top" style="display: none">
+      <h1>SQL queries</h1>
+      '.$dbInfoDetails
+      .'
-      </div>
-    </div>
@@ -373 +373 @@
-    $content = '
-    <h2>'.$id.' <a href="#" onclick="sfWebDebugToggle(\'sfWebDebug'.$id.'\')"><img src="'.$this->base_image_path.'/toggle.gif" /></a></h2>
-
+@
-    ';
-
@@ -437 +437 @@
-    return $retval;
-  }
+
+  private function getPriority($value)
+  {
+    if ($value >= 6)
+    {
+      return 'info';
+    }
+    else if ($value >= 4)
+    {
+      return 'warning';
+    }
+    else
+    {
+      return 'error';
+    }
+  }
-}
-

branches/pookey/lib/exception/sfException.class.php

@@ -199 +199 @@
-  private function formatArrayAsHtml($values)
-  {
-
+@
-  }
-

branches/pookey/lib/generator/sfPropelAdminGenerator.class.php

@@ -262 +262 @@
-    if ($column->isPartial())
-    {
-
+type' => 'edit', '
-    }
-
@@ -512 +512 @@
-    if ($column->isPartial())
-    {
-
+type' => 'list', '
-    }
-    else if ($type == CreoleTypes::DATE || $type == CreoleTypes::TIMESTAMP)
@@ -521 +521 @@
-    elseif ($type == CreoleTypes::BOOLEAN)
-    {
-o
+tic
-    }
-    else
@@ -537 +537 @@
-    if ($column->isPartial())
-    {
-
+type' => 'filter', '
-    }
-

branches/pookey/lib/validator/sfFileValidator.class.php

@@ -84 +84 @@
-    $this->getParameterHolder()->add($parameters);
-
+    // pre-defined categories
+    $categories = array(
+      '@web_images' => array(
+        'image/jpeg',
+        'image/pjpeg',
+        'image/png',
+        'image/x-png',
+        'image/gif',
+      ),
+    );
+
+    if (!is_array($this->getParameter('mime_types')))
+    {
+      if (isset($categories[$this->getParameter('mime_types')]))
+      {
+        $this->setParameter('mime_types', $categories[$this->getParameter('mime_types')]);
+      }
+      else
+      {
+        $this->setParameter('mime_types', array($this->getParameter('mime_types')));
+      }
+    }
+
-    return true;
-  }