Automne

Merge lp:~julien-breux/automne/410a into lp:~automne-team/automne/trunk

  1. 410a
  2. Merge into trunk
Proposed by Julien Breux
Status: Superseded
Proposed branch: lp:~julien-breux/automne/410a
Merge into: lp:~automne-team/automne/trunk
Diff against target: 234 lines (+25/-101)
7 files modified
.bzrignore (+1/-1)
automne/admin/css/main.css (+1/-1)
automne/admin/js/ext/MultiSelect.js (+10/-9)
automne/admin/js/ext/conf.js (+1/-2)
automne/classes/modules/standard_rc.xml (+1/-1)
automne_linx_files/1.php.linx (+6/-45)
html/1.php (+5/-42)
To merge this branch: bzr merge lp:~julien-breux/automne/410a
Reviewer Review Type Date Requested Status
Sébastien Pauchet Approve
Julien Breux (community) Needs Information
Review via email: mp+36227@code.launchpad.net

This proposal has been superseded by a proposal from 2010-09-23.

Description of the change

Fixed error loading images ;-)

To post a comment you must log in.
Revision history for this message
Sébastien Pauchet (sebastien-pauchet) wrote :

In file automne/admin/js/ext/MultiSelect.js
imagePath:"img/multiselect/", should use the variable Automne.context.path to calculate image path because it can be used from automne/admin/modules/.../ directories.

review: Disapprove
Revision history for this message
Julien Breux (julien-breux) wrote :

> In file automne/admin/js/ext/MultiSelect.js
> imagePath:"img/multiselect/", should use the variable Automne.context.path to
> calculate image path because it can be used from automne/admin/modules/.../
> directories.

In this context, it's unable to use "Automne" object.

How do I ?

FN: It's same problem with "automne/admin/js/ext/conf.js", "Automne" object is undefined or not declared.

review: Needs Information
Revision history for this message
Sébastien Pauchet (sebastien-pauchet) wrote :

You should use Automne.context.path directly in onRender method instead.

lp:~julien-breux/automne/410a updated
267. By Julien Breux

Correct some bugs with subfolder management

Revision history for this message
Sébastien Pauchet (sebastien-pauchet) wrote :

In file automne/admin/js/ext/MultiSelect.js you mistakenly remove the following line (arround line 322) :
this.iconUp = this.imagePath + (this.iconUp || 'up2.gif');

All other changes are good

review: Disapprove
Revision history for this message
Julien Breux (julien-breux) wrote :

It's ok for me :)

lp:~julien-breux/automne/410a updated
268. By Julien Breux

Fix to conform

Revision history for this message
Sébastien Pauchet (sebastien-pauchet) :
review: Approve
lp:~julien-breux/automne/410a updated
269. By Julien Breux

Add duplicating rows

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2010-09-06 15:20:52 +0000
3+++ .bzrignore 2010-09-22 10:34:41 +0000
4@@ -27,4 +27,4 @@
5 ./img/demo
6 ./js/modules/*/*-demo.js
7 ./js/modules/*
8-./sql/demo-*.sql
9\ No newline at end of file
10+./sql/demo-*.sql
11
12=== modified file 'automne/admin/css/main.css'
13--- automne/admin/css/main.css 2010-08-25 16:09:23 +0000
14+++ automne/admin/css/main.css 2010-09-22 10:34:41 +0000
15@@ -71,7 +71,7 @@
16 }
17 .search-item .atm-help,
18 .atm-result .atm-help {
19- background: url(/automne/admin/img/atm-help.png) top left no-repeat;
20+ background: url(../automne/admin/img/atm-help.png) top left no-repeat;
21 padding-left: 6px;
22 }
23 .x-form-item .atm-help,
24
25=== modified file 'automne/admin/js/ext/MultiSelect.js'
26--- automne/admin/js/ext/MultiSelect.js 2010-08-25 16:09:23 +0000
27+++ automne/admin/js/ext/MultiSelect.js 2010-09-22 10:34:41 +0000
28@@ -148,9 +148,9 @@
29 this.view.clearSelections();
30 this.hiddenField.dom.value = '';
31
32- if (!values || (values == '')) { return; }
33+ if (!values || (values == '')) {return;}
34
35- if (!(values instanceof Array)) { values = values.split(this.delimiter); }
36+ if (!(values instanceof Array)) {values = values.split(this.delimiter);}
37 for (var i=0; i<values.length; i++) {
38 index = this.view.store.indexOf(this.view.store.query(this.valueField,
39 new RegExp('^' + values[i] + '$', "i")).itemAt(0));
40@@ -208,7 +208,7 @@
41 msWidth:200,
42 msHeight:300,
43 hideNavIcons:false,
44- imagePath:"../automne/admin/img/multiselect/",
45+ imagePath:"/automne/admin/img/multiselect/",
46 iconUp:"up2.gif",
47 iconDown:"down2.gif",
48 iconLeft:"left2.gif",
49@@ -322,6 +322,7 @@
50
51 if (this.imagePath!="" && this.imagePath.charAt(this.imagePath.length-1)!="/")
52 this.imagePath+="/";
53+ this.imagePath = Automne.context.path+this.imagePath;
54 this.iconUp = this.imagePath + (this.iconUp || 'up2.gif');
55 this.iconDown = this.imagePath + (this.iconDown || 'down2.gif');
56 this.iconLeft = this.imagePath + (this.iconLeft || 'left2.gif');
57@@ -354,12 +355,12 @@
58 this.addIcon.on('click', this.fromTo, this);
59 this.removeIcon.on('click', this.toFrom, this);
60 }
61- if (!this.drawUpIcon || this.hideNavIcons) { this.upIcon.dom.style.display='none'; }
62- if (!this.drawDownIcon || this.hideNavIcons) { this.downIcon.dom.style.display='none'; }
63- if (!this.drawLeftIcon || this.hideNavIcons) { this.addIcon.dom.style.display='none'; }
64- if (!this.drawRightIcon || this.hideNavIcons) { this.removeIcon.dom.style.display='none'; }
65- if (!this.drawTopIcon || this.hideNavIcons) { this.toTopIcon.dom.style.display='none'; }
66- if (!this.drawBotIcon || this.hideNavIcons) { this.toBottomIcon.dom.style.display='none'; }
67+ if (!this.drawUpIcon || this.hideNavIcons) {this.upIcon.dom.style.display='none';}
68+ if (!this.drawDownIcon || this.hideNavIcons) {this.downIcon.dom.style.display='none';}
69+ if (!this.drawLeftIcon || this.hideNavIcons) {this.addIcon.dom.style.display='none';}
70+ if (!this.drawRightIcon || this.hideNavIcons) {this.removeIcon.dom.style.display='none';}
71+ if (!this.drawTopIcon || this.hideNavIcons) {this.toTopIcon.dom.style.display='none';}
72+ if (!this.drawBotIcon || this.hideNavIcons) {this.toBottomIcon.dom.style.display='none';}
73
74 var tb = p.body.first();
75 this.el.setWidth(p.body.first().getWidth());
76
77=== modified file 'automne/admin/js/ext/conf.js'
78--- automne/admin/js/ext/conf.js 2010-08-25 16:09:23 +0000
79+++ automne/admin/js/ext/conf.js 2010-09-22 10:34:41 +0000
80@@ -4,8 +4,7 @@
81 * Provide some configuration for ExtJS
82 * @package CMS
83 * @subpackage JS
84- * @author Sébastien Pauchet <sebastien.pauchet@ws-interactive.fr>
85- * $Id: conf.js,v 1.3 2010/03/08 15:20:22 sebastien Exp $
86+ * @author Sébastien Pauchet <sebastien.pauchet@ws-interactive.fr>
87 */
88 // reference to local blank image
89 Ext.BLANK_IMAGE_URL = 'img/s.gif';
90
91=== modified file 'automne/classes/modules/standard_rc.xml' (properties changed: +x to -x)
92--- automne/classes/modules/standard_rc.xml 2010-08-25 16:09:23 +0000
93+++ automne/classes/modules/standard_rc.xml 2010-09-22 10:34:41 +0000
94@@ -1,5 +1,5 @@
95 <cms-module-parameters>
96- <param name="APPLICATION_LABEL" type="text">Automne 4</param>
97+ <param name="APPLICATION_LABEL" type="text">Automne</param>
98 <param name="APPLICATION_MAINTAINER_EMAIL" type="email">root@localhost</param>
99 <param name="APPLICATION_POSTMASTER_EMAIL" type="email">root@localhost</param>
100 <param name="SYSTEM_DEBUG" type="boolean">1</param>
101
102=== modified file 'automne_linx_files/1.php.linx' (properties changed: +x to -x)
103--- automne_linx_files/1.php.linx 2010-09-06 16:07:24 +0000
104+++ automne_linx_files/1.php.linx 2010-09-22 10:34:41 +0000
105@@ -1,57 +1,18 @@
106 <?php
107-<<<<<<< TREE
108-require_once(dirname(__FILE__).'/../cms_rc_frontend.php');
109-CMS_view::redirect('http://automne4.trunk/web/demo/2-accueil.php', true, 302);
110-?><?php
111-//Generated on Tue, 24 Aug 2010 18:04:09 +0200 by Automne (TM) 4.0.2
112-=======
113-<<<<<<< TREE
114-//Generated on Wed, 23 Jun 2010 15:06:09 +0200 by Automne (TM) 4.0.2
115->>>>>>> MERGE-SOURCE
116-require_once(dirname(__FILE__).'/../cms_rc_frontend.php');
117-=======
118-require_once($_SERVER["DOCUMENT_ROOT"]."/cms_rc_frontend.php");
119-CMS_view::redirect('http://acezar.401/web/demo/2-automne-version-4-gouter-a-la-simplicite.php', true, 302);
120-?><?php
121-//Generated on Mon, 03 May 2010 09:39:59 +0200 by Automne (TM) 4.0.1
122-require_once($_SERVER["DOCUMENT_ROOT"]."/cms_rc_frontend.php");
123->>>>>>> MERGE-SOURCE
124+//Generated on Tue, 21 Sep 2010 22:56:24 +0200 by Automne (TM) 4.1.0a1
125+require_once(dirname(__FILE__).'/../cms_rc_frontend.php');
126 if (!isset($cms_page_included) && !$_POST && !$_GET) {
127-<<<<<<< TREE
128- CMS_view::redirect('http://automne4.trunk/web/1-demo-automne.php', true, 301);
129-=======
130-<<<<<<< TREE
131- CMS_view::redirect('http://automne4.trunk/web/1-accueil.php', true, 301);
132-=======
133- CMS_view::redirect('http://acezar.401/web/1-demo-automne.php', true, 301);
134->>>>>>> MERGE-SOURCE
135->>>>>>> MERGE-SOURCE
136+ CMS_view::redirect('http://localhost/automne/web/1-accueil.php', true, 301);
137 }
138 ?><?php /* Template [Splash - splash.xml] */ ?><?php if (defined('APPLICATION_XHTML_DTD')) echo APPLICATION_XHTML_DTD."\n"; ?>
139 <html xmlns="http://www.w3.org/1999/xhtml" lang="fr">
140 <head>
141 <?php echo '<meta http-equiv="Content-Type" content="text/html; charset='.strtoupper(APPLICATION_DEFAULT_ENCODING).'" />'; ?>
142-<<<<<<< TREE
143- <link rel="icon" type="image/x-icon" href="http://automne4.trunk/favicon.ico" />
144-<<<<<<< TREE
145-=======
146- <meta name="language" content="en" />
147-=======
148- <link rel="icon" type="image/x-icon" href="http://acezar.401/favicon.ico" />
149->>>>>>> MERGE-SOURCE
150+ <link rel="icon" type="image/x-icon" href="http://localhost/automne/favicon.ico" />
151 <meta name="language" content="fr" />
152-<<<<<<< TREE
153-=======
154->>>>>>> MERGE-SOURCE
155->>>>>>> MERGE-SOURCE
156 <meta name="generator" content="Automne (TM)" />
157-<<<<<<< TREE
158- <meta name="identifier-url" content="http://automne4.trunk" />
159- <base href="http://automne4.trunk/" /> <script type="text/javascript" src="/js/CMS_functions.js"></script>
160-=======
161- <meta name="identifier-url" content="http://acezar.401" />
162- <script type="text/javascript" src="/js/CMS_functions.js"></script>
163->>>>>>> MERGE-SOURCE
164+ <meta name="identifier-url" content="http://localhost/automne" />
165+ <base href="http://localhost/automne/" /> <script type="text/javascript" src="/automne/js/CMS_functions.js"></script>
166
167 <style type="text/css">
168 body{
169
170=== modified file 'html/1.php' (properties changed: +x to -x)
171--- html/1.php 2010-09-06 16:07:24 +0000
172+++ html/1.php 2010-09-22 10:34:41 +0000
173@@ -1,54 +1,17 @@
174-<<<<<<< TREE
175-<?php require_once(dirname(__FILE__).'/../cms_rc_frontend.php');
176-CMS_view::redirect('http://automne4.trunk/web/demo/2-accueil.php', true, 302);
177- ?><?php //Generated on Tue, 24 Aug 2010 18:04:09 +0200 by Automne (TM) 4.0.2
178-=======
179-<<<<<<< TREE
180-<?php //Generated on Wed, 23 Jun 2010 15:06:09 +0200 by Automne (TM) 4.0.2
181->>>>>>> MERGE-SOURCE
182+<?php //Generated on Tue, 21 Sep 2010 22:56:24 +0200 by Automne (TM) 4.1.0a1
183 require_once(dirname(__FILE__).'/../cms_rc_frontend.php');
184-=======
185-<?php require_once($_SERVER["DOCUMENT_ROOT"]."/cms_rc_frontend.php");
186-CMS_view::redirect('http://acezar.401/web/demo/2-automne-version-4-gouter-a-la-simplicite.php', true, 302);
187- ?><?php //Generated on Mon, 03 May 2010 09:39:59 +0200 by Automne (TM) 4.0.1
188-require_once($_SERVER["DOCUMENT_ROOT"]."/cms_rc_frontend.php");
189->>>>>>> MERGE-SOURCE
190 if (!isset($cms_page_included) && !$_POST && !$_GET) {
191-<<<<<<< TREE
192- CMS_view::redirect('http://automne4.trunk/web/1-demo-automne.php', true, 301);
193-=======
194-<<<<<<< TREE
195- CMS_view::redirect('http://automne4.trunk/web/1-accueil.php', true, 301);
196-=======
197- CMS_view::redirect('http://acezar.401/web/1-demo-automne.php', true, 301);
198->>>>>>> MERGE-SOURCE
199->>>>>>> MERGE-SOURCE
200+ CMS_view::redirect('http://localhost/automne/web/1-accueil.php', true, 301);
201 }
202 ?><?php /* Template [Splash - splash.xml] */ ?><?php if (defined('APPLICATION_XHTML_DTD')) echo APPLICATION_XHTML_DTD."\n"; ?>
203 <html xmlns="http://www.w3.org/1999/xhtml" lang="fr">
204 <head>
205 <?php echo '<meta http-equiv="Content-Type" content="text/html; charset='.strtoupper(APPLICATION_DEFAULT_ENCODING).'" />'; ?>
206-<<<<<<< TREE
207- <link rel="icon" type="image/x-icon" href="http://automne4.trunk/favicon.ico" />
208-<<<<<<< TREE
209-=======
210- <meta name="language" content="en" />
211-=======
212- <link rel="icon" type="image/x-icon" href="http://acezar.401/favicon.ico" />
213->>>>>>> MERGE-SOURCE
214+ <link rel="icon" type="image/x-icon" href="http://localhost/automne/favicon.ico" />
215 <meta name="language" content="fr" />
216-<<<<<<< TREE
217-=======
218->>>>>>> MERGE-SOURCE
219->>>>>>> MERGE-SOURCE
220 <meta name="generator" content="Automne (TM)" />
221-<<<<<<< TREE
222- <meta name="identifier-url" content="http://automne4.trunk" />
223- <base href="http://automne4.trunk/" /> <script type="text/javascript" src="/js/CMS_functions.js"></script>
224-=======
225- <meta name="identifier-url" content="http://acezar.401" />
226- <script type="text/javascript" src="/js/CMS_functions.js"></script>
227->>>>>>> MERGE-SOURCE
228+ <meta name="identifier-url" content="http://localhost/automne" />
229+ <base href="http://localhost/automne/" /> <script type="text/javascript" src="/automne/js/CMS_functions.js"></script>
230
231 <style type="text/css">
232 body{
233
234=== modified file 'index.php' (properties changed: +x to -x)

Subscribers

People subscribed via source and target branches