From 2c1b366fdf18929e255a223bc88474b446eaafa8 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 12 Feb 2014 14:44:27 -0800
Subject: make activities optional for profile things, clean up the forms

---
 view/css/mod_thing.css   | 14 ++++----------
 view/tpl/thing_edit.tpl  |  4 ++++
 view/tpl/thing_input.tpl |  5 +++++
 3 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'view')

diff --git a/view/css/mod_thing.css b/view/css/mod_thing.css
index 2a2ba7c92..125230b38 100644
--- a/view/css/mod_thing.css
+++ b/view/css/mod_thing.css
@@ -4,22 +4,16 @@
 	margin-left: 0;
 }
 
-.thing-verb-label {
-	margin-top: 15px;
-}
-
-.thing-verb {
-	margin-bottom: 15px;
-}
 
-.thing-label {
+.thing-label, .field label, .thing-verb-label, .thing-profile-label{
 	float: left;
-	width: 250px;
+	width: 350px;
 }
 
-.thing-input {
+.thing-input, .thing-verb, .thing-profile{
 	float: left;
 	margin-bottom: 15px;
+	width: 400px;
 }
 
 .thing-field-end {
diff --git a/view/tpl/thing_edit.tpl b/view/tpl/thing_edit.tpl
index 8379c15ae..b170f152c 100644
--- a/view/tpl/thing_edit.tpl
+++ b/view/tpl/thing_edit.tpl
@@ -6,11 +6,13 @@
 <div class="thing-profile-label">{{$profile_lbl}}</div>
 
 <div class="thing-profile">{{$profile_select}}</div>
+<div class="thing-field-end"></div>
 {{/if}}
 
 <div class="thing-verb-label">{{$verb_lbl}}</div>
 
 <div class="thing-verb">{{$verb_select}}</div>
+<div class="thing-field-end"></div>
 
 
 <label class="thing-label" for="thing-term">{{$thing_lbl}}</label>
@@ -23,6 +25,8 @@
 <input type="text" class="thing-input" id="thing-img" name="img" value="{{$imgurl}}" />
 <div class="thing-field-end"></div>
 
+{{include file="field_checkbox.tpl" field=$activity}}
+
 <div class="thing-end"></div> 
 
 <input type="submit" class="thing-submit" name="submit" value="{{$submit}}" />
diff --git a/view/tpl/thing_input.tpl b/view/tpl/thing_input.tpl
index 06cbfe917..e93a1aa65 100644
--- a/view/tpl/thing_input.tpl
+++ b/view/tpl/thing_input.tpl
@@ -5,11 +5,14 @@
 <div class="thing-profile-label">{{$profile_lbl}}</div>
 
 <div class="thing-profile">{{$profile_select}}</div>
+<div class="thing-field-end"></div>
 {{/if}}
 
+
 <div class="thing-verb-label">{{$verb_lbl}}</div>
 
 <div class="thing-verb">{{$verb_select}}</div>
+<div class="thing-field-end"></div>
 
 
 <label class="thing-label" for="thing-term">{{$thing_lbl}}</label>
@@ -22,6 +25,8 @@
 <input type="text" class="thing-input" id="thing-img" name="img" />
 <div class="thing-field-end"></div>
 
+{{include file="field_checkbox.tpl" field=$activity}}
+
 <div class="thing-end"></div> 
 
 <input type="submit" class="thing-submit" name="submit" value="{{$submit}}" />
-- 
cgit v1.2.3