<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -21,10 +21,17 @@
   &lt;% person.extra_listable_attributes.each do |attr| %&gt;
     &lt;%= f.auto_field(attr.name) %&gt;
   &lt;% end %&gt;
-  &lt;%= f.file_field(:photo, :note =&gt; person.has_photo? ? 
-                   _('You have already uploaded your photo to the ' +
-                     'system. If you upload a new one, the current ' +
-                     'will be overwritten.') : '') %&gt;
+  &lt;% photo_note = _('You can provide a photo to be used for your ' +
+                    'nametag generation, to appear as part of your ' +
+                    'public personal profile, and during your interfacing ' +
+                    'with the system.')
+     if person.has_photo?
+       photo_note &lt;&lt; '&lt;br/&gt;' &lt;&lt; _('You have already uploaded your ' +
+                     'photo to the system. If you upload a new one, ' +
+                     'the current will be overwritten.')
+     end
+  %&gt;
+  &lt;%= f.file_field(:photo, :note =&gt; photo_note) %&gt;
   &lt;%= f.auto_field(:ok_general_mails, :note =&gt; _('Are you interested ' +
                    'in receiving general information mails from us?')) %&gt;
   &lt;%= f.auto_field(:ok_conf_mails, :note =&gt; _('Are you interested ' +</diff>
      <filename>app/views/people/_pers_data.html.erb</filename>
    </modified>
    <modified>
      <diff>@@ -21,11 +21,13 @@
 	     'able to present it for identification and for ' +
 	     'attendance tracking.' ) %
 	   link_to(_('print your nametag'), :action =&gt; 'my_nametag') %&gt;&lt;/p&gt;
+    &lt;p&gt;&lt;%= _('You will be able to use this nametag for any of the ' +
+	     'conferences organized by us.') %&gt;&lt;/p&gt;
   &lt;/div&gt;
 &lt;% end %&gt;
 
 &lt;% if @can_define_nametag %&gt;
-  &lt;div id=&quot;define-nametag&quot;&gt;
+  &lt;div class=&quot;comas-for-admin&quot;&gt;
     &lt;p&gt;&lt;%= _('In order to define or change a nametag format, %s and ' +
 	     'register its name as the ' +
 	     '&lt;tt&gt;%s&lt;/tt&gt; key in the %s interface') %</diff>
      <filename>app/views/people/account.html.erb</filename>
    </modified>
    <modified>
      <diff>@@ -331,3 +331,11 @@ td, th {
     color: red;
     background: #fee;
 }
+
+.comas-for-admin {
+    border: solid black 1px;
+    background-color: #eee;
+    padding-left: 1em;
+    padding-right: 1em;
+    margin: 1em;
+}</diff>
      <filename>public/stylesheets/comas.css</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>d9cc7f57969b6f99eab0bd3efb3c40b37df4fd3b</id>
    </parent>
  </parents>
  <author>
    <name>Gunnar Wolf</name>
    <email>gwolf@gwolf.org</email>
  </author>
  <url>http://github.com/gwolf/comas/commit/086a2264aa0a999cc3c5dd000685bd753b144cf5</url>
  <id>086a2264aa0a999cc3c5dd000685bd753b144cf5</id>
  <committed-date>2009-10-01T11:27:56-07:00</committed-date>
  <authored-date>2009-10-01T11:27:56-07:00</authored-date>
  <message>Some notes clarifying the role of the personal photo</message>
  <tree>cb5892d0644f58e20e65cae2bd154b8a1a442b2e</tree>
  <committer>
    <name>Gunnar Wolf</name>
    <email>gwolf@gwolf.org</email>
  </committer>
</commit>
