From d61a526542bd742b3a2dc1069195afe42bdd7c70 Mon Sep 17 00:00:00 2001
From: mb863 <mb863@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 11 Jan 2011 19:58:13 +0000
Subject: [PATCH] NIHVIVO-1316: Added add/edit/delete functionality to object
 properties in individual pages.

---
 webapp/web/css/individual/individual.css         |  15 +++++++++++++++
 webapp/web/images/individual/addIcon.gif         | Bin 0 -> 164 bytes
 webapp/web/images/individual/deleteIcon.gif      | Bin 0 -> 73 bytes
 webapp/web/images/individual/editIcon.gif        | Bin 0 -> 74 bytes
 .../individual/individual-properties.ftl         |   2 +-
 .../body/partials/individual/lib-properties.ftl  |   7 ++++---
 6 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 webapp/web/images/individual/addIcon.gif
 create mode 100644 webapp/web/images/individual/deleteIcon.gif
 create mode 100644 webapp/web/images/individual/editIcon.gif

diff --git a/webapp/web/css/individual/individual.css b/webapp/web/css/individual/individual.css
index b5085beeb..31f15f9b7 100644
--- a/webapp/web/css/individual/individual.css
+++ b/webapp/web/css/individual/individual.css
@@ -368,4 +368,19 @@ article.property ul.subclass-property-list li{
     padding: 0.2em 0.4em;
     font-size: 0.8em;
     background: #f4f4f4;
+}
+/* EDITING DISPLAY------>  */
+.add-individual{
+    vertical-align: middle;
+    margin-left: 2px;
+}
+.edit-individual{
+    border-left: 1px dotted #B2D15A;
+    margin-left: 10px;
+    padding-left: 8px;
+    padding-right: 1px;
+    vertical-align: text-top;
+}
+.delete-individual{
+    vertical-align: text-top;
 }
\ No newline at end of file
diff --git a/webapp/web/images/individual/addIcon.gif b/webapp/web/images/individual/addIcon.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d6b7513cd427752f40cf2117e75a94682d878a6e
GIT binary patch
literal 164
zcmV;V09*e@Nk%w1VGjTg0J9GOfQXXp?e4q3#r5|0;^gLbe~PfSyq%+~#mUWyk(#Hi
zv(D1hlbWO0+um$;f&c&iA^8LW000jFEC2ui01p5U000D0@W~exa4v~4r@$aq5S<a8
z4*4`;@+=|19U-%x!gJbe-5-rcKtc$LdWKF1G&m_9ghK6+nD#(Pgf&zcJ{YwN2r(Ie
SQI4DvA;tieoj?#C0RTHXc}5uk

literal 0
HcmV?d00001

diff --git a/webapp/web/images/individual/deleteIcon.gif b/webapp/web/images/individual/deleteIcon.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a2eb344106055fa974f50c96e7e0cb1ec7252bf2
GIT binary patch
literal 73
zcmZ?wbhEHb<YnMzXkcK7NGbUL|G(l-7DfgJMg|=QAOOiQFe&sjavnSV_YSvTq-(lO
a<<C2<^F1cTr#7YUT=!BV^J=RogEasKycm`M

literal 0
HcmV?d00001

diff --git a/webapp/web/images/individual/editIcon.gif b/webapp/web/images/individual/editIcon.gif
new file mode 100644
index 0000000000000000000000000000000000000000..febfe465ad7a53f36cbce1d91bf82916291a86d4
GIT binary patch
literal 74
zcmZ?wbhEHb<YVAxXkcK7NGbUL|G(l-7DfgJMg|=QAOOiQFe&!*GoIwSeP(u{?+k_1
bUt9YWAE;NxNXk8axg<+^>$;3%tPIuw5PTRu

literal 0
HcmV?d00001

diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
index 6d709532f..cab153763 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
@@ -24,7 +24,7 @@
         <#list group.properties as property>
             <article class="property" role="article">
                 <#-- Property display name -->
-                <h3>${property.name}</h3> <@p.addLink property showEditingLinks />
+                <h3>${property.name} <@p.addLink property showEditingLinks /></h3> 
 
                 <#-- List the statements for each property -->   
                 <ul class="property-list" role="list"> 
diff --git a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
index 13fc16973..096219442 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
@@ -36,7 +36,7 @@
     <#if showEditingLinks>
         <#local url = property.addUrl>
         <#if url?has_content>
-            <a href="${url}">add</a>
+            <a href="${url}"><img class="add-individual" src="${urls.images}/individual/addIcon.gif" alt="add relationship" /></a>
         </#if>
     </#if>
 </#macro>
@@ -44,6 +44,7 @@
 <#macro propertyListItem statement showEditingLinks>
     <li role="listitem">    
         <#nested>
+        
         <@editingLinks statement showEditingLinks />
     </li>
 </#macro>
@@ -58,13 +59,13 @@
 <#macro editLink statement>
     <#local url = statement.editUrl>
     <#if url?has_content>
-        <a href="${url}">edit</a>
+        <a href="${url}"><img class="edit-individual" src="${urls.images}/individual/editIcon.gif" alt="change this relationship" /></a>
     </#if>
 </#macro>
 
 <#macro deleteLink statement> 
     <#local url = statement.deleteUrl>
     <#if url?has_content>
-        <a href="${url}">delete</a>
+        <a href="${url}"><img  class="delete-individual" src="${urls.images}/individual/deleteIcon.gif" alt="delete this relationship" /></a>
     </#if>
 </#macro>
\ No newline at end of file