Improve edit form layout

4 files changed, 35 insertions, 3 deletions

diff --git a/chimere/forms.py b/chimere/forms.py
index e7accab..1d49ff3 100644
--- a/chimere/forms.py
+++ b/chimere/forms.py
@@ -260,6 +260,7 @@ class MarkerAdminFormBase(forms.ModelForm):
     """
     Main form for marker
     """
+    name = forms.CharField(_(u"Name"), required=True)
     description = forms.CharField(widget=TextareaAdminWidget, required=False)
 
     class Meta:
@@ -291,6 +292,11 @@ class MarkerAdminFormBase(forms.ModelForm):
             self.fields['categories'].choices = subcategories
         elif hasattr(self, 'categories_choices'):
             self.fields['categories'].choices = self.categories_choices
+        if not settings.CHIMERE_SEARCH_ENGINE:
+            self.fields.pop('keywords')
+        if not settings.CHIMERE_DAYS_BEFORE_EVENT:
+            self.fields.pop('start_date')
+            self.fields.pop('end_date')
 
     def clean(self):
         '''
diff --git a/chimere/models.py b/chimere/models.py
index 3744544..d9b388d 100644
--- a/chimere/models.py
+++ b/chimere/models.py
@@ -1815,6 +1815,11 @@ class PropertyModel(models.Model):
         blank=True, verbose_name=_(u"Restricted to theses sub-categories"),
         help_text=_(u"If no sub-category is set all the property applies to "
                     u"all sub-categories"))
+    areas = SelectMultipleField(
+        'Area', verbose_name=_(u"Restrict to theses areas"), blank=True,
+        null=True,
+        help_text=_(u"If no area is set the property apply to "
+                    u"all areas"))
     TYPE = (('T', _('Text')),
             ('L', _('Long text')),
             ('P', _('Password')),
diff --git a/chimere/static/chimere/css/forms.css b/chimere/static/chimere/css/forms.css
index 2cf9a56..0a22e74 100644
--- a/chimere/static/chimere/css/forms.css
+++ b/chimere/static/chimere/css/forms.css
@@ -37,7 +37,7 @@
 }
 
 div.bottomform{
-    clear: left;
+    clear: both;
     width: 100%;
 }
 
diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css
index d371df8..accac25 100644
--- a/chimere/static/chimere/css/styles.css
+++ b/chimere/static/chimere/css/styles.css
@@ -36,9 +36,13 @@ h2, h3, th, .action li, .action li a,
     color:#000;
 }
 
+th{
+    color: #449506;
+}
+
 /* background-color definition */
 
-body, h2, h3, th,
+body, h2, h3,
 .ui-widget-header,
 #layer_selection h4,
 .action li.selected, #no-js-message,
@@ -173,7 +177,7 @@ fieldset{
 }
 
 .edit label{
-    display:inline;
+    display: block;
 }
 
 a:link[disabled],
@@ -748,6 +752,18 @@ a#welcome_button,
 
 /* forms */
 
+button{
+    padding: 2px 4px;
+    font-size: 14px;
+    line-height: 1.42857;
+    color: #555;
+    vertical-align: middle;
+    background-color: #FFF;
+    border: 1px solid #CCC;
+    border-radius: 4px;
+    box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075) inset;
+}
+
 table.inline-table{
 }
 
@@ -768,6 +784,11 @@ table.inline-table td input[type=file]{
     width:260px;
 }
 
+table.inline-table td input[type=file]{
+    border: 0 solid transparent;
+    box-shadow: none;
+}
+
 #live_lonlat p{
     display:inline-table;
 }