[Agavi-Commits] r4897 - in trunk: . src/build/templates/defaults/app/modules/templates src/build/templates/defaults/app/modules/views
com...@lists.agavi.org
Date: 2011-12-14 21:55:56 +0100 (Wed, 14 Dec 2011)
New Revision: 4897
Modified:
trunk/
trunk/CHANGELOG-1.0
trunk/src/build/templates/defaults/app/modules/templates/WelcomeSuccess.php.tmpl
trunk/src/build/templates/defaults/app/modules/views/WelcomeSuccessView.class.php.tmpl
Log:
merge [4891:4896/branches/1.0]
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.0:2658-4890
/branches/config-1.1:4687-4733
/branches/david-azure:4475-4478
/branches/david-numbers:4397-4455
+ /branches/1.0:2658-4896
/branches/config-1.1:4687-4733
/branches/david-azure:4475-4478
/branches/david-numbers:4397-4455
Modified: trunk/CHANGELOG-1.0
===================================================================
--- trunk/CHANGELOG-1.0 2011-12-14 20:41:38 UTC (rev 4896)
+++ trunk/CHANGELOG-1.0 2011-12-14 20:55:56 UTC (rev 4897)
@@ -1,6 +1,17 @@
AGAVI CHANGELOG (1.0.x)
=======================
+1.0.7 RC2 (December 14, 2011)
+-----------------------------
+
+CHG: Add missing interfaces to default compile.xml (#1462) (David)
+CHG: Guarantee order of form population and give preferential treatment to automatically re-populated forms (#1461) (David)
+CHG: Update singular and plural rules in AgaviInflector (#1460) (David)
+
+FIX: Inflector does not handle uncountable words as part of strings (#1459) (David)
+FIX: Fatal errors with PHPUnit 3.6 (#1457) (David)
+
+
1.0.7 RC1 (November 20, 2011)
-----------------------------
Modified: trunk/src/build/templates/defaults/app/modules/templates/WelcomeSuccess.php.tmpl
===================================================================
--- trunk/src/build/templates/defaults/app/modules/templates/WelcomeSuccess.php.tmpl 2011-12-14 20:41:38 UTC (rev 4896)
+++ trunk/src/build/templates/defaults/app/modules/templates/WelcomeSuccess.php.tmpl 2011-12-14 20:55:56 UTC (rev 4897)
@@ -11,62 +11,110 @@
}
body {
- width: 100%;
height: 100%;
margin: 0;
- padding: 0;
+ padding: 0 20%;
background-color: #FFF;
background-image: url('welcome/bg.png');
background-position: left top;
background-repeat: repeat-x;
- font-family: 'Trebuchet MS', Verdana, Tahoma, Arial, Helvetica, sans-serif;
- font-size: 10pt;
- color: #999;
+ font: 13px/20px Helvetica, Arial, Verdana, sans-serif;
+ color: #444;
+ text-align: center;
}
a, a:link, a:visited, a:active, a:hover {
- color: #AAF;
+ color: #339;
}
-div {
+h1 {
margin-top: 50px;
- padding-top: 340px;
+ padding-top: 360px;
background-image: url('welcome/plant.png');
background-position: top center;
background-repeat: no-repeat;
- text-align: center;
}
-h1 {
- color: #666;
+h2 {
+ margin-top: 2em;
}
-p.light {
- color: #CCC;
+div.tip, div.warning
+{
+ margin: 20px 0;
+ padding: 10px 20px;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ -o-border-radius: 4px;
+ border-radius: 4px;
+ text-shadow: 0 1px 1px #fff;
+ text-align: left;
+ color: #333;
}
+div.tip
+{
+ background-color: #F9F3D2;
+ border-bottom: 1px solid #DEDBC6;
+}
+div.warning
+{
+ background-color: #F9D2D2;
+ border-bottom: 1px solid #DEC6C6;
+}
-p.light a, p.light a:link, p.light a:visited, p.light a:active, p.light a:hover {
- color: #CCF;
+div.tip h5, div.warning h5
+{
+ display: inline;
+ margin-bottom: 10px;
+ font-weight: bold;
+ text-shadow: 0 1px 1px #fff;
+ font-size: 110%;
}
+div.tip h5:after, div.warning h5:after
+{
+ content: ": ";
+}
+code {
+ padding: 1px 3px;
+ font-family: monospace;
+ background-color: #efefef;
+ border: 1px solid #ccc;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ -o-border-radius: 3px;
+ border-radius: 3px;
+}
+div.tip code {
+ background-color: #DEDBC6;
+}
+div.warning code {
+ background-color: #DEC6C6;
+}
+
</style>
</head>
<body>
- <div>
- <h1>Welcome to Agavi!</h1>
- <p>You successfully created your first project! Awesome!</p>
- <p> </p>
- <p>To get started, refer to the Agavi manual, or play around with the sample application that was included with this distribution.</p>
- <p>If you have any questions, join us in <b>#agavi</b> on <b>irc.freenode.net</b> or consult the "users" mailing list.</p>
- <p> </p>
- <p><strong>This page will appear until you remove the corresponding rule from the <code>routing.xml</code> configuration file.</strong></p>
- <p>To get rid of this page, delete the route from <code>app/config/routing.xml</code> and remove the directories <code>app/modules/Welcome/</code> and <code>pub/welcome/</code>.</p>
- <p> </p>
- <p><strong>Remember not to check in <code>pub/.htaccess</code> and <code>pub/index.php</code> into your version control system - always make copies of those from <code>dev/pub/</code>.</strong></p>
- <p> </p>
- <p><a href="http://www.agavi.org/">Agavi Homepage</a></p>
- <p> </p>
- <p>You are running <em><?php echo $t['agavi_release']; ?></em></p>
+ <h1>Welcome to Agavi!</h1>
+ <p>You successfully created your first project running <em><?php echo $t['agavi_release']; ?></em>, congratulations!</p>
+<?php if($t['warn_display_errors']):?>
+ <div class="warning">
+ <h5>Warning</h5>
+ You will not see error messages or exceptions because your PHP installation is not configured correctly for development. Please edit <?php if($t['php_ini_path']): ?><code><?php echo htmlspecialchars($t['php_ini_path']); ?></code><?php else: ?>your system's <code>php.ini</code><?php endif; ?> and change <code>display_errors</code> to <code>on</code>. While you're at it, make sure <code>error_reporting</code> is set to <code><?php echo $t['recommended_error_reporting']?></code>.
</div>
+<?php endif; ?>
+ <h2>Getting Started and Getting Help</h3>
+ <p>To get started, refer to the <a href="http://www.agavi.org/documentation">documentation</a>, or play around with the sample application that is included in the Agavi source distribution.</p>
+ <p>If you have any questions, <a href="https://webchat.freenode.net/?channels=agavi">join</a> us in <a href="irc://irc.freenode.net/agavi">#agavi</a> on <a href="http://www.freenode.net/">irc.freenode.net</a> or consult the <a href="http://www.agavi.org/support">other support sources</a>.</p>
+ <div class="tip">
+ <h5>Tip</h5>
+ This welcome page will appear until you remove the corresponding routing rule from <code>app/config/routing.xml</code>. Once you have done that, make sure you also delete the directories <code>app/modules/Welcome/</code> and <code>pub/welcome/</code>.
+ </div>
+ <h2>Other Resources</h2>
+ <p>Visit the <a href="http://www.agavi.org/">Agavi Website</a>, follow <a href="http://twitter.com/Agavi">@Agavi on Twitter</a>, or explore <a href="http://trac.agavi.org/">code and tickets</a>.</p>
+ <div class="tip">
+ <h5>Tip</h5>
+ Remember not to check <code>pub/.htaccess</code> and <code>pub/index.php</code> into your version control system; always make copies of those from <code>dev/pub/</code> or run <code>agavi public-create</code> to have them created.
+ </div>
</body>
</html>
\ No newline at end of file
Modified: trunk/src/build/templates/defaults/app/modules/views/WelcomeSuccessView.class.php.tmpl
===================================================================
--- trunk/src/build/templates/defaults/app/modules/views/WelcomeSuccessView.class.php.tmpl 2011-12-14 20:41:38 UTC (rev 4896)
+++ trunk/src/build/templates/defaults/app/modules/views/WelcomeSuccessView.class.php.tmpl 2011-12-14 20:55:56 UTC (rev 4897)
@@ -9,6 +9,9 @@
$this->setupHtml($rd, 'simple');
$this->setAttribute('agavi_release', AgaviConfig::get('agavi.release'));
+ $this->setAttribute('warn_display_errors', !ini_get('display_errors'));
+ $this->setAttribute('php_ini_path', function_exists('php_ini_loaded_file') ? php_ini_loaded_file() : null); // 5.2.3 and later
+ $this->setAttribute('recommended_error_reporting', version_compare(PHP_VERSION, '5.4', '<') ? 'E_ALL | E_STRICT' : 'E_ALL'); // 5.4 and up have E_STRICT included in E_ALL
}
}
_______________________________________________
Agavi Commits Mailing List
com...@lists.agavi.org
http://lists.agavi.org/mailman/listinfo/commits