Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
erp5
Commits
7810dd4a
Commit
7810dd4a
authored
May 31, 2016
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ZMI: small cosmetics changes to field settings
parent
cecc1a98
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
23 additions
and
28 deletions
+23
-28
product/ERP5Form/ProxyField.py
product/ERP5Form/ProxyField.py
+3
-1
product/ERP5Form/dtml/proxyFieldEdit.dtml
product/ERP5Form/dtml/proxyFieldEdit.dtml
+7
-8
product/ERP5Form/dtml/proxyFieldListHeader.dtml
product/ERP5Form/dtml/proxyFieldListHeader.dtml
+2
-0
product/ERP5Form/dtml/proxyFieldTales.dtml
product/ERP5Form/dtml/proxyFieldTales.dtml
+4
-8
product/Formulator/dtml/fieldEdit.dtml
product/Formulator/dtml/fieldEdit.dtml
+3
-5
product/Formulator/dtml/fieldListHeader.dtml
product/Formulator/dtml/fieldListHeader.dtml
+1
-1
product/Formulator/dtml/fieldTales.dtml
product/Formulator/dtml/fieldTales.dtml
+3
-5
No files found.
product/ERP5Form/ProxyField.py
View file @
7810dd4a
...
@@ -101,6 +101,7 @@ class ProxyWidget(Widget.Widget):
...
@@ -101,6 +101,7 @@ class ProxyWidget(Widget.Widget):
description
=
\
description
=
\
"ID of the master form."
,
"ID of the master form."
,
default
=
""
,
default
=
""
,
display_width
=
40
,
required
=
1
)
required
=
1
)
field_id
=
fields
.
StringField
(
field_id
=
fields
.
StringField
(
...
@@ -109,12 +110,13 @@ class ProxyWidget(Widget.Widget):
...
@@ -109,12 +110,13 @@ class ProxyWidget(Widget.Widget):
description
=
\
description
=
\
"ID of the field in the master form."
,
"ID of the field in the master form."
,
default
=
""
,
default
=
""
,
display_width
=
40
,
required
=
1
)
required
=
1
)
target
=
fields
.
HyperLinkField
(
target
=
fields
.
HyperLinkField
(
'target'
,
'target'
,
title
=
'Proxy Target'
,
title
=
'Proxy Target'
,
description
=
"Link to the master field edit form"
,
description
=
"Link to the master field edit form
.
"
,
default
=
'Click to edit the target'
,
default
=
'Click to edit the target'
,
href
=
'manage_edit_target'
,
href
=
'manage_edit_target'
,
required
=
0
)
required
=
0
)
...
...
product/ERP5Form/dtml/proxyFieldEdit.dtml
View file @
7810dd4a
<style>form td:not(:last-child) { padding-right: 1em; }</style>
<dtml-var manage_page_header>
<dtml-var manage_page_header>
<dtml-let help_product="'Formulator'" help_topic=meta_type>
<dtml-let help_product="'Formulator'" help_topic=meta_type>
<dtml-var manage_tabs>
<dtml-var manage_tabs>
...
@@ -42,6 +43,9 @@ Surcharge <dtml-var meta_type> properties here.
...
@@ -42,6 +43,9 @@ Surcharge <dtml-var meta_type> properties here.
<td><div class="form-element">
<td><div class="form-element">
<dtml-var "field.meta_type">
<dtml-var "field.meta_type">
</div></td>
</div></td>
<td><div class="form-element">
<dtml-var "field.get_value('description')">
</div></td>
</tr>
</tr>
</dtml-let>
</dtml-let>
</dtml-in>
</dtml-in>
...
@@ -50,7 +54,8 @@ Surcharge <dtml-var meta_type> properties here.
...
@@ -50,7 +54,8 @@ Surcharge <dtml-var meta_type> properties here.
</dtml-let>
</dtml-let>
</dtml-in>
</dtml-in>
</table>
<table cellspacing="0" cellpadding="2" border="0">
<!-- Then, display Template Field properties -->
<!-- Then, display Template Field properties -->
<dtml-if "current_field is not None">
<dtml-if "current_field is not None">
...
@@ -123,19 +128,13 @@ Surcharge <dtml-var meta_type> properties here.
...
@@ -123,19 +128,13 @@ Surcharge <dtml-var meta_type> properties here.
</dtml-let>
</dtml-let>
</dtml-if>
</dtml-if>
</dtml-let>
</dtml-let>
</table>
<tr>
<td align="left" valign="top">
<div class="form-element">
<div class="form-element">
<input class="form-element" type="submit" name="submit"
<input class="form-element" type="submit" name="submit"
value="Save Changes" />
value="Save Changes" />
</div>
</div>
</td>
</tr>
</table>
</form>
</form>
<script type="text/javascript">
<script type="text/javascript">
...
...
product/ERP5Form/dtml/proxyFieldListHeader.dtml
View file @
7810dd4a
...
@@ -19,9 +19,11 @@
...
@@ -19,9 +19,11 @@
Field
Field
</div>
</div>
</td>
</td>
<dtml-if "_['URL'].endswith(('/manage_main', '/manage_edit'))">
<td align="left" valign="top">
<td align="left" valign="top">
<div class="form-label">
<div class="form-label">
Description
Description
</div>
</div>
</td>
</td>
</dtml-if>
</tr>
</tr>
product/ERP5Form/dtml/proxyFieldTales.dtml
View file @
7810dd4a
<style>form td:not(:last-child) { padding-right: 1em; }</style>
<dtml-var manage_page_header>
<dtml-var manage_page_header>
<dtml-var manage_tabs>
<dtml-var manage_tabs>
...
@@ -52,8 +53,8 @@ This tab can therefore not be used.
...
@@ -52,8 +53,8 @@ This tab can therefore not be used.
</dtml-let>
</dtml-let>
</dtml-in>
</dtml-in>
</table>
<table cellspacing="0" cellpadding="2" border="0">
<!-- XXX Loop until find not a proxy field -->
<!-- XXX Loop until find not a proxy field -->
<dtml-let proxy_field="this()"
<dtml-let proxy_field="this()"
...
@@ -125,18 +126,13 @@ This tab can therefore not be used.
...
@@ -125,18 +126,13 @@ This tab can therefore not be used.
</dtml-let>
</dtml-let>
</dtml-if>
</dtml-if>
</dtml-let>
</dtml-let>
</table>
<tr>
<td align="left" valign="top">
<div class="form-element">
<div class="form-element">
<input class="form-element" type="submit" name="submit"
<input class="form-element" type="submit" name="submit"
value="Save Changes" />
value="Save Changes" />
</div>
</div>
</td>
</tr>
</table>
</form>
</form>
<script type="text/javascript">
<script type="text/javascript">
function isClass(object, className) {
function isClass(object, className) {
...
...
product/Formulator/dtml/fieldEdit.dtml
View file @
7810dd4a
<style>form td:not(:last-child) { padding-right: 1em; }</style>
<dtml-var manage_page_header>
<dtml-var manage_page_header>
<dtml-let help_product="'Formulator'" help_topic=meta_type>
<dtml-let help_product="'Formulator'" help_topic=meta_type>
<dtml-var manage_tabs>
<dtml-var manage_tabs>
...
@@ -50,16 +51,13 @@ Edit <dtml-var meta_type> properties here.
...
@@ -50,16 +51,13 @@ Edit <dtml-var meta_type> properties here.
</dtml-if>
</dtml-if>
</dtml-let>
</dtml-let>
</dtml-in>
</dtml-in>
</table>
<tr>
<td align="left" valign="top">
<div class="form-element">
<div class="form-element">
<input class="form-element" type="submit" name="submit"
<input class="form-element" type="submit" name="submit"
value="Save Changes" />
value="Save Changes" />
</div>
</div>
</td>
</tr>
</table>
</form>
</form>
<dtml-var manage_page_footer>
<dtml-var manage_page_footer>
...
...
product/Formulator/dtml/fieldListHeader.dtml
View file @
7810dd4a
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
Field
Field
</div>
</div>
</td>
</td>
<dtml-if "_['URL'].
find('manage_main')>-1
">
<dtml-if "_['URL'].
endswith(('/manage_main', '/manage_edit'))
">
<td align="left" valign="top">
<td align="left" valign="top">
<div class="form-label">
<div class="form-label">
Description
Description
...
...
product/Formulator/dtml/fieldTales.dtml
View file @
7810dd4a
<style>form td:not(:last-child) { padding-right: 1em; }</style>
<dtml-var manage_page_header>
<dtml-var manage_page_header>
<dtml-var manage_tabs>
<dtml-var manage_tabs>
...
@@ -49,16 +50,13 @@ This tab can therefore not be used.
...
@@ -49,16 +50,13 @@ This tab can therefore not be used.
</dtml-if>
</dtml-if>
</dtml-let>
</dtml-let>
</dtml-in>
</dtml-in>
</table>
<tr>
<td align="left" valign="top">
<div class="form-element">
<div class="form-element">
<input class="form-element" type="submit" name="submit"
<input class="form-element" type="submit" name="submit"
value="Save Changes" />
value="Save Changes" />
</div>
</div>
</td>
</tr>
</table>
</form>
</form>
<dtml-var manage_page_footer>
<dtml-var manage_page_footer>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment