Merge branch 'master' of https://github.com/thelia/thelia

Conflicts: core/lib/Thelia/Config/Resources/routing/front.xml reset_install.sh
2013-09-04 16:05:25 +02:00
parent 308d4d9297 b910b0af86
commit ba645764fc
105 changed files with 3617 additions and 2946 deletions
--- a/templates/default/404.html
+++ b/templates/default/404.html
@@ -0,0 +1,3 @@
+<h1>PAGE NOT FOUND</h1>
+
+<a href="{navigate to="index"}">Back Home</a>
--- a/templates/default/debug.html
+++ b/templates/default/debug.html
@@ -1,14 +1,11 @@
-<h2>ALL ATTRIBUTES AND THEIR AVAILABILITY</h2>
+<h2>ALL ATTRIBUTES</h2>

 <ul>
-    {loop name="attr" type="attribute" order="manual" lang="2" backend_context="true"}
+    {loop name="attr" type="attribute"}
    <li>
-        {if #IS_TRANSLATED == 1}#TITLE{else}to be translated{/if}
-        <ul>
-            {loop name="attrav" type="attribute_availability" order="manual" attribute="#ID" lang="3"}
-            <li>{if #IS_TRANSLATED == 1}#TITLE{else}to be translated{/if}</li>
-            {/loop}
-        </ul>
+        #TITLE - (#LOOP_COUNT / #LOOP_TOTAL)<br />
+        created at {format_date date=$CREATE_DATE} - updated at {format_date date=$UPDATE_DATE}
+        <hr />
    </li>
    {/loop}
 </ul>
--- a/templates/install/index.html
+++ b/templates/install/index.html
@@ -0,0 +1,12 @@
+{extends file="layout.html"}
+{block name="content"}
+    <h1>{intl l="Thelia installation wizard"}</h1>
+    <br />
+
+    {intl l="Bienvenue au sein du programme d'installation de Thelia."}<br />
+    {intl l="Nous allons vous guider tout au long de ce processus afin d'installer l'application sur votre système."}<br /><br />
+
+    <form action="{url path="/install/step/2" }" method="post">
+        <input type="submit" value="Continuer" />
+    </form>
+{/block}
--- a/templates/install/layout.html
+++ b/templates/install/layout.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html lang="{$lang_code}">
+<head>
+    <title>{block name="title"}Thelia Install{/block}</title>
+
+    {images file='../admin/default/assets/img/favicon.ico'}<link rel="shortcut icon" href="{$asset_url}" />{/images}
+
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    {stylesheets file='../admin/default/assets/bootstrap/css/bootstrap.css' filters='cssembed'}
+        <link rel="stylesheet" href="{$asset_url}">
+    {/stylesheets}
+
+    {stylesheets file='../admin/default/assets/bootstrap/css/bootstrap-responsive.css' filters='cssembed'}
+        <link rel="stylesheet" href="{$asset_url}">
+    {/stylesheets}
+
+
+    {stylesheets file='../admin/default/assets/css/*' filters='less,cssembed'}
+        <link rel="stylesheet" href="{$asset_url}">
+    {/stylesheets}
+
+</head>
+<body>
+<div class="topbar">
+    <div class="container">
+        <div class="version-info">{intl l='Version %ver' ver="{$THELIA_VERSION}"}</div>
+    </div>
+</div>
+<div id="wrapper" class="container">
+    {block name="content"}{/block}
+</div>
+
+<hr />
+<footer class="footer">
+    <div class="container">
+        <p>{intl l='&copy; Thelia 2013'}
+            - <a href="http://www.openstudio.fr/" target="_blank">{intl l='Édité par OpenStudio'}</a>
+            - <a href="http://forum.thelia.net/" target="_blank">{intl l='Forum Thelia'}</a>
+            - <a href="http://contrib.thelia.net/" target="_blank">{intl l='Contributions Thelia'}</a>
+            <span class="pull-right">{intl l='interface par <a target="_blank" href="http://www.steaw-webdesign.com/">Steaw-Webdesign</a>'}</span>
+        </p>
+
+
+    </div>
+</footer>
+
+</body>
+</html>