Menu
▾
▴
[Archetypes-checkins] r7284 - in Archetypes/trunk: browser skins/archetypes skins/archetypes/widgets skins/archetypes_kss
|
From: ree <svn...@pl...> - 2006-12-19 14:10:51
|
Author: ree
Date: Tue Dec 19 14:10:42 2006
New Revision: 7284
Added:
Archetypes/trunk/browser/fields.py
- copied unchanged from r7283, Archetypes/branches/kss-merge/browser/fields.py
Archetypes/trunk/skins/archetypes_kss/
- copied from r7283, Archetypes/branches/kss-merge/skins/archetypes_kss/
Archetypes/trunk/skins/archetypes_kss/at.kss
- copied unchanged from r7283, Archetypes/branches/kss-merge/skins/archetypes_kss/at.kss
Modified:
Archetypes/trunk/browser/configure.zcml
Archetypes/trunk/skins/archetypes/base.pt
Archetypes/trunk/skins/archetypes/widgets/addable_support.pt
Archetypes/trunk/skins/archetypes/widgets/field.pt
Archetypes/trunk/skins/archetypes/widgets/multiselection.pt
Archetypes/trunk/skins/archetypes/widgets/selection.pt
Archetypes/trunk/skins/archetypes/widgets/string.pt
Archetypes/trunk/skins/archetypes/widgets/textarea.pt
Log:
Merge in kss
Modified: Archetypes/trunk/browser/configure.zcml
==============================================================================
--- Archetypes/trunk/browser/configure.zcml (original)
+++ Archetypes/trunk/browser/configure.zcml Tue Dec 19 14:10:42 2006
@@ -18,4 +18,12 @@
allowed_attributes="begin_edit cancel_edit"
/>
-</configure>
\ No newline at end of file
+ <browser:page
+ for="*"
+ name="kss_field_decorator_view"
+ permission="zope2.View"
+ class=".fields.DefaultFieldDecoratorView"
+ allowed_attributes="kss_class"
+ />
+
+</configure>
Modified: Archetypes/trunk/skins/archetypes/base.pt
==============================================================================
--- Archetypes/trunk/skins/archetypes/base.pt (original)
+++ Archetypes/trunk/skins/archetypes/base.pt Tue Dec 19 14:10:42 2006
@@ -17,7 +17,14 @@
<div metal:use-macro="here/document_actions/macros/document_actions">
Document actions (print, sendto etc)
</div>
- <h1 tal:content="title_string | here/title_or_id" />
+ <h1 tal:define="kss_field_decorator_view kss_field_decorator_view | context/@@kss_field_decorator_view;
+ kss_class python:kss_field_decorator_view.kss_class('title', 'view');"
+ id="archetypes-fieldname-title"
+ tal:content="title_string | here/title_or_id"
+ tal:attributes="class kss_class;">
+ Title or id
+ </h1>
+
<tal:has_document_byline tal:condition="exists:here/document_byline">
<div metal:use-macro="here/document_byline/macros/byline">
Get the byline - contains details about author and modification date.
@@ -26,7 +33,8 @@
</metal:header_macro>
<metal:body_macro metal:define-macro="body"
- tal:define="field_macro field_macro | here/widgets/field/macros/view;"
+ tal:define="field_macro field_macro | here/widgets/field/macros/view;
+ kss_field_decorator_view kss_field_decorator_view | context/@@kss_field_decorator_view;"
tal:repeat="field python:here.Schema().filterFields(isMetadata=0)">
<tal:if_visible define="mode string:view;
visState python:field.widget.isVisible(here, mode);
Modified: Archetypes/trunk/skins/archetypes/widgets/addable_support.pt
==============================================================================
--- Archetypes/trunk/skins/archetypes/widgets/addable_support.pt (original)
+++ Archetypes/trunk/skins/archetypes/widgets/addable_support.pt Tue Dec 19 14:10:42 2006
@@ -90,7 +90,7 @@
</div>
</div>
</fieldset>
- <script tal:content="structure here/reference_js"></script>
+ <!--script tal:content="structure here/reference_js"></script-->
</div>
</div>
</tal:block>
Modified: Archetypes/trunk/skins/archetypes/widgets/field.pt
==============================================================================
--- Archetypes/trunk/skins/archetypes/widgets/field.pt (original)
+++ Archetypes/trunk/skins/archetypes/widgets/field.pt Tue Dec 19 14:10:42 2006
@@ -52,9 +52,11 @@
<metal:block use-macro="widget_view" />
</metal:data_macro>
- <div metal:define-macro="view" tal:define="fieldtypename python:field.getType().split('.')[-1]"
- tal:attributes="class string:field ArchetypesField-${fieldtypename};
- id string:archetypes-fieldname-${field/getName}">
+ <div metal:define-macro="view" tal:define="fieldtypename python:field.getType().split('.')[-1];
+ kss_field_decorator_view kss_field_decorator_view | context/@@kss_field_decorator_view;
+ kss_class python:kss_field_decorator_view.kss_class(field.getName(), 'view');"
+ tal:attributes="class string:field ArchetypesField-${fieldtypename}${kss_class};
+ id string:archetypes-fieldname-${field/getName}">
<metal:use_base_view use-macro="here/widgets/field/macros/base_view" />
</div>
@@ -70,9 +72,11 @@
<tal:condition
condition="python:visState == 'visible' and visCondition">
<div class="field"
+ tal:define="kss_field_decorator_view kss_field_decorator_view | context/@@kss_field_decorator_view;
+ kss_class python:kss_field_decorator_view.kss_class(field.getName(), 'edit');"
tal:condition="python:('edit' in widget.modes and 'w' in field.mode and field.checkPermission('w',here))
or (mode=='search' and field.checkPermission('r',here))"
- tal:attributes="class python: test(error_id, 'field error ' + 'Archetypes' + widget.getName(), 'field ' + 'Archetypes' + widget.getName());
+ tal:attributes="class python: test(error_id, 'field error ' + 'Archetypes' + widget.getName(), 'field ' + 'Archetypes' + widget.getName()) + ' ' + kss_class;
id python: 'archetypes-fieldname-' + field.getName()">
<span metal:define-slot="widget_body_label_prefix"></span>
<label i18n:translate=""
@@ -108,7 +112,7 @@
</span>
<span tal:omit-tag=""
tal:define="error python:errors.get(fieldName)">
- <div tal:condition="error_id"
+ <div class="fieldErrorBox"
tal:content="error_id" i18n:translate="">Validation Error</div>
<div metal:define-slot="widget_body"></div>
</span>
Modified: Archetypes/trunk/skins/archetypes/widgets/multiselection.pt
==============================================================================
--- Archetypes/trunk/skins/archetypes/widgets/multiselection.pt (original)
+++ Archetypes/trunk/skins/archetypes/widgets/multiselection.pt Tue Dec 19 14:10:42 2006
@@ -31,6 +31,7 @@
<div class="ArchetypesMultiSelectionValue" id=""
tal:attributes="id string:archetypes-value-${fieldName}_${repeat/item/number}">
<input
+ class="kssValidateInput"
tal:attributes="type string:checkbox;
name string:$fieldName:list;
id string:${fieldName}_${repeat/item/number};
@@ -45,6 +46,7 @@
</span>
<select multiple="multiple"
+ class="kssValidateInput"
tal:condition="python:format=='select'"
tal:attributes="name string:${fieldName}:list;
id fieldName;
Modified: Archetypes/trunk/skins/archetypes/widgets/selection.pt
==============================================================================
--- Archetypes/trunk/skins/archetypes/widgets/selection.pt (original)
+++ Archetypes/trunk/skins/archetypes/widgets/selection.pt Tue Dec 19 14:10:42 2006
@@ -33,7 +33,7 @@
<tal:radios repeat="item vocab">
- <input class="noborder"
+ <input class="noborder kssValidateInput"
tabindex=""
type="radio"
tal:define="tabindex tabindex/next"
Modified: Archetypes/trunk/skins/archetypes/widgets/string.pt
==============================================================================
--- Archetypes/trunk/skins/archetypes/widgets/string.pt (original)
+++ Archetypes/trunk/skins/archetypes/widgets/string.pt Tue Dec 19 14:10:42 2006
@@ -8,24 +8,25 @@
<!-- String Widgets -->
<metal:view_macro define-macro="view"
- tal:replace="structure accessor" />
+ tal:replace="structure accessor" />
<metal:define define-macro="edit">
<metal:use use-macro="field_macro | here/widgets/field/macros/edit">
- <input metal:fill-slot="widget_body"
- type="text"
- name=""
- id=""
+ <input metal:fill-slot="widget_body"
+ type="text"
+ name=""
+ class="kssValidateInput"
+ id=""
value=""
- size="30"
- tabindex="#"
- tal:attributes="name fieldName;
- id fieldName;
- value value;
- size widget/size;
- maxlength widget/maxlength;
- tabindex tabindex/next;"
- />
+ size="30"
+ tabindex="#"
+ tal:attributes="name fieldName;
+ id fieldName;
+ value value;
+ size widget/size;
+ maxlength widget/maxlength;
+ tabindex tabindex/next;"
+ />
</metal:use>
</metal:define>
Modified: Archetypes/trunk/skins/archetypes/widgets/textarea.pt
==============================================================================
--- Archetypes/trunk/skins/archetypes/widgets/textarea.pt (original)
+++ Archetypes/trunk/skins/archetypes/widgets/textarea.pt Tue Dec 19 14:10:42 2006
@@ -25,6 +25,7 @@
<textarea
tabindex="#"
+ class="kssValidateInput"
tal:attributes="name fieldName;
id fieldName;
cols widget/cols;
|