diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/contact_edit.tpl | 49 | ||||
| -rw-r--r-- | view/theme/duepuntozero/style.css | 41 |
2 files changed, 33 insertions, 57 deletions
diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl index d1fa951f6..768d03cad 100644 --- a/view/contact_edit.tpl +++ b/view/contact_edit.tpl @@ -14,6 +14,27 @@ <div id="contact-edit-drop-link-end"></div> <div id="contact-edit-nav-wrapper" > + <div id="contact-edit-info-links"> + <div id="contact-edit-nettype">$nettype</div> + <div id="contact-edit-rel">$relation_text</div> + {{ if $insecure }} + <div id="insecure message"><span class="icon unlock"></span> $insecure</div> + {{ endif }} + {{ if $blocked }} + <div id="block-message">$blocked</div> + {{ endif }} + {{ if $ignored }} + <div id="ignore-message">$ignored</div> + {{ endif }} + {{ if $common_text }} + <div id="contact-edit-common"><a href="common/$contact_id">$common_text</a></div> + {{ endif }} + {{ if $all_friends }} + <div id="contact-edit-allfriends"><a href="allfriends/$contact_id">$all_friends</a></div> + {{ endif }} + </div> + + <div id="contact-edit-links" > <ul> <li><a href="network/?cid=$contact_id" id="contact-view-recent">$lblrecent</a></li> @@ -25,50 +46,34 @@ <li><a href="crepair/$contact_id" id="contact-edit-repair" title="$lblcrepair">$lblcrepair</a></li> </ul> </div> - <div id="contact-edit-info-links"> - <div id="contact-edit-nettype">$nettype</div> - {{ if $common_text }} - <div id="contact-edit-common"><a href="common/$contact_id">$common_text</a></div> - {{ endif }} - <div id="contact-edit-allfriends"><a href="allfriends/$contact_id">$all_friends</a></div> - </div> </div> <div id="contact-edit-nav-end"></div> <form action="contacts/$contact_id" method="post" > <input type="hidden" name="contact_id" value="$contact_id"> -{# <img id="contact-edit-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" /> #} - {{ if $poll_enabled }} + {{ if $poll_enabled }} <div id="contact-edit-poll-wrapper"> <div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span></div> - <div id="contact-edit-poll-text">$updpub</div> - $poll_interval - <div id="contact-edit-update-now" class="button"><a href="contacts/$contact_id/update" >$udnow</a></div> + <span id="contact-edit-poll-text">$updpub</span> $poll_interval <span id="contact-edit-update-now" class="button"><a href="contacts/$contact_id/update" >$udnow</a></span> </div> - {{ endif }} + {{ endif }} <div id="contact-edit-end" ></div> -$insecure -$blocked -$ignored - - <div id="contact-edit-info-wrapper"> <h4>$lbl_info1</h4> -<textarea id="contact-edit-info" rows="10" cols="72" name="info" >$info</textarea> + <textarea id="contact-edit-info" rows=8 cols=72 name="info" >$info</textarea> + <input class="contact-edit-submit" type="submit" name="submit" value="$submit" /> </div> <div id="contact-edit-info-end"></div> -<input class="contact-edit-submit" type="submit" name="submit" value="$submit" /> <div id="contact-edit-profile-select-text"> <h4>$lbl_vis1</h4> -<p>$lbl_vis2 -</p> +<p>$lbl_vis2</p> </div> $profile_select <div id="contact-edit-profile-select-end"></div> diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index e0f0c6d2b..049817537 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -804,11 +804,6 @@ input#dfrn-url { clear: both; } -#contact-edit-end { - clear: both; - margin-bottom: 65px; -} - #fsuggest-desc, #fsuggest-submit-wrapper { margin-top: 15px; margin-bottom: 15px; @@ -1404,16 +1399,10 @@ input#dfrn-url { font-weight: bold; } -#contact-edit-nettype { - margin-top: 5px; - margin-left: 30px; -} - - #contact-edit-poll-wrapper { - margin-left: 50px; - margin-top: 30px; + margin-top: 15px; } + #contact-edit-poll-text { margin-top: 15px; margin-bottom: 5px; @@ -1436,23 +1425,10 @@ input#dfrn-url { margin-right: 20px; } -/* -#contact-edit-drop-link img { - margin-left: 20px; - border: none; -} -*/ - #contact-edit-nav-end { clear: both; } -#contact-edit-direction-icon { - float: left; - margin-top: 70px; - margin-right: 2px; -} - #contact-edit-photo { float: left; } @@ -1473,6 +1449,10 @@ input#dfrn-url { float: left; } +#contact-edit-info-links div { + margin-left: 30px; +} + #contact-edit-end { clear: both; } @@ -1517,12 +1497,7 @@ input#dfrn-url { #block-message, #ignore-message { - margin-top: 20px; color: #FF0000; - font-size: 1.1em; - border: 1px solid #FF8888; - background-color: #FFEEEE; - padding: 10px; } #profile-edit-insecure { @@ -1536,10 +1511,6 @@ input#dfrn-url { width: 587px; } -#block-message, #ignore-message { - width: 180px; -} - #profile-jot-text { height: 20px; color:#cccccc; |