aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/contact_edit.tpl92
-rw-r--r--view/theme/duepuntozero/style.css93
-rw-r--r--view/theme/testbubble/contact_edit.tpl67
-rw-r--r--view/theme/testbubble/style.css65
4 files changed, 85 insertions, 232 deletions
diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl
index c2e3e36fb..44eb850ac 100644
--- a/view/contact_edit.tpl
+++ b/view/contact_edit.tpl
@@ -1,74 +1,74 @@
<h2>$header</h2>
-<div id="contact-edit-banner-name">$name</div>
-
-$nettype
+<div id="contact-edit-wrapper" >
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
+ <div id="contact-edit-drop-link" >
+ <a href="contacts/$contact_id/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>
+ </div>
-<div id="contact-edit-wrapper" >
+ <div id="contact-edit-drop-link-end"></div>
- <div id="contact-edit-photo-wrapper" >
- <img id="contact-edit-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
- <div id="contact-edit-photo" >
- <a href="$url" title="$visit" /><img src="$photo" $sparkle alt="$name" /></a>
+ <div id="contact-edit-nav-wrapper" >
+ <div id="contact-edit-links">
+ <ul>
+ <li><div id="contact-edit-rel">$relation_text</div></li>
+ <li><div id="contact-edit-nettype">$nettype</div></li>
+ {{ if $insecure }}
+ <li><div id="insecure-message">$insecure</div></li>
+ {{ endif }}
+ {{ if $blocked }}
+ <li><div id="block-message">$blocked</div></li>
+ {{ endif }}
+ {{ if $ignored }}
+ <li><div id="ignore-message">$ignored</div></li>
+ {{ endif }}
+ {{ if $common_text }}
+ <li><div id="contact-edit-common"><a href="common/$contact_id">$common_text</a></div></li>
+ {{ endif }}
+ {{ if $all_friends }}
+ <li><div id="contact-edit-allfriends"><a href="allfriends/$contact_id">$all_friends</a></div></li>
+ {{ endif }}
+
+ <li>&nbsp;</li>
+
+ <li><a href="network/?cid=$contact_id" id="contact-edit-view-recent">$lblrecent</a></li>
+ {{ if $lblsuggest }}
+ <li><a href="fsuggest/$contact_id" id="contact-edit-suggest">$lblsuggest</a></li>
+ {{ endif }}
+ <li><a href="contacts/$contact_id/block" id="contact-edit-block-link" title="$block_text">$block_text</a></li>
+ <li><a href="contacts/$contact_id/ignore" id="contact-edit-ignore-link" title="$ignore_text">$ignore_text</a></li>
+ <li><a href="crepair/$contact_id" id="contact-edit-repair" title="$lblcrepair">$lblcrepair</a></li>
+ </ul>
</div>
- <div id="contact-edit-photo-end" ></div>
</div>
- <div id="contact-edit-nav-wrapper" >
+ <div id="contact-edit-nav-end"></div>
- <div id="contact-edit-links" >
- <a href="contacts/$contact_id/block" class="icon block" id="contact-edit-block-link" title="$block_text"></a>
- <a href="contacts/$contact_id/ignore" class="icon no" id="contact-edit-ignore-link" title="$ignore_text"></a>
- <a href="crepair/$contact_id" class="icon tools" id="contact-edit-repair" title="$lblcrepair"></a>
-
- </div>
- <div id="contact-drop-links" >
- <a href="contacts/$contact_id/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>
- </div>
- <div id="contact-edit-nav-end"></div>
+<form action="contacts/$contact_id" method="post" >
+<input type="hidden" name="contact_id" value="$contact_id">
- {{ 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>
+ <div id="contact-edit-last-update-text">$lastupdtext <span id="contact-edit-last-updated">$last_update</span></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 }}
- </div>
- <div id="contact-edit-end" ></div>
-
-
- {{ if $common_text }}
- <div id="contact-edit-common">
- <a href="$common_link">$common_text</a>
- </a>
{{ endif }}
+ <div id="contact-edit-end" ></div>
-$insecure
-$blocked
-$ignored
-
-<div id="view-recent-wrapper"><a href="network/?cid=$contact_id" id="contact-view-recent">$lblrecent</a></div>
-$lblsuggest
<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 e9c0817f4..088cb7c18 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -583,6 +583,7 @@ input#dfrn-url {
#profile-photo-wrapper img {
width:175px;
height:175px;
+ padding: 12px;
}
#profile-edit-profile-name-label,
@@ -804,11 +805,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;
@@ -1396,25 +1392,18 @@ input#dfrn-url {
}
#contact-edit-wrapper {
- margin-top: 50px;
+ margin-top: 10px;
}
#contact-edit-banner-name {
font-size: 1.4em;
font-weight: bold;
- margin-left: 30px;
}
-#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;
@@ -1424,53 +1413,28 @@ input#dfrn-url {
margin-top: 15px;
}
-#contact-edit-photo-wrapper {
- margin-bottom: 20px;
-}
-#contact-edit-links {
- float: left;
-}
-#contact-edit-links a {
- float: left;
-}
-#contact-edit-links img {
- margin-left: 20px;
- border: none;
-}
-
-#contact-drop-links {
- float: left;
-}
-
-#contact-drop-links img {
- margin-left: 20px;
- border: none;
-}
-
-#contact-edit-nav-end {
+#contact-edit-links{
clear: both;
}
-#contact-edit-direction-icon {
- float: left;
- margin-top: 70px;
- margin-right: 2px;
+#contact-edit-links ul {
+ list-style: none;
}
-
-#contact-edit-photo {
- float: left;
+#contact-edit-links li {
+ margin-top: 5px;
}
-#contact-edit-photo-end {
- clear: both;
+#contact-edit-drop-link {
+ float: right;
+ margin-right: 20px;
}
-#contact-edit-photo-wrapper {
- float: left;
+#contact-edit-nav-end {
+ clear: both;
}
-#contact-edit-nav-wrapper {
- float: left;
+#contact-edit-wrapper {
+ width: 100%;
}
#contact-edit-end {
@@ -1482,17 +1446,8 @@ input#dfrn-url {
margin-left: 175px;
}
-#contact-reputation-selector {
- margin-left: 175px;
-}
-
-#contact-edit-rating-text {
- margin-left: 175px;
-}
-
.contact-edit-submit {
margin-top: 20px;
- /*margin-left: 50px;*/
}
@@ -1525,12 +1480,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 {
@@ -1544,10 +1494,6 @@ input#dfrn-url {
width: 587px;
}
-#block-message, #ignore-message {
- width: 180px;
-}
-
#profile-jot-text {
height: 20px;
color:#cccccc;
@@ -2229,13 +2175,14 @@ a.mail-list-link {
.fn {
- padding: 0px 0px 5px 0px;
+ padding: 0px 0px 5px 12px;
font-size: 120%;
font-weight: bold;
}
.vcard .title {
margin-bottom: 5px;
+ margin-left: 12px;
}
.vcard dl {
@@ -2512,10 +2459,6 @@ a.mail-list-link {
width: 300px;
}
-#contact-edit-links .icon, #contact-drop-links .icon {
- margin: 0px 3px 0px 3px;
-}
-
#netsearch-box {
margin-top: 20px;
diff --git a/view/theme/testbubble/contact_edit.tpl b/view/theme/testbubble/contact_edit.tpl
deleted file mode 100644
index 9191a36b0..000000000
--- a/view/theme/testbubble/contact_edit.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-
-<h2>$header</h2>
-
-<div id="contact-edit-banner-name">$name</div>
-
-$nettype
-
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
-
-<div id="contact-edit-wrapper" >
-
- <div id="contact-edit-photo-wrapper" >
- <img id="contact-edit-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
- <div id="contact-edit-photo" class="lframe">
- <a href="$url" title="$visit" /><img src="$photo" $sparkle alt="$name" /></a>
- </div>
- <div id="contact-edit-photo-end" ></div>
- </div>
- <div id="contact-edit-nav-wrapper" >
-
- <div id="contact-edit-links" >
- <a href="contacts/$contact_id/block" class="icon block" id="contact-edit-block-link" title="$block_text"></a>
- <a href="contacts/$contact_id/ignore" class="icon no" id="contact-edit-ignore-link" title="$ignore_text"></a>
- <a href="crepair/$contact_id" class="icon tools" id="contact-edit-repair" title="$lblcrepair"></a>
- <a href="contacts/$contact_id/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>
- </div>
- <div id="contact-edit-nav-end"></div>
-
- {{ 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>
- </div>
- {{ endif }}
- </div>
- <div id="contact-edit-end" ></div>
-
-$insecure
-$blocked
-$ignored
-
-<div id="view-recent-wrapper"><a href="network/?cid=$contact_id" id="contact-view-recent" class="button">$lblrecent</a></div>
-$lblsuggest
-
-<div id="contact-edit-info-wrapper">
-<h4>$lbl_info1</h4>
-<textarea id="contact-edit-info" rows="10" cols="72" name="info" >$info</textarea>
-</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>
-</div>
-$profile_select
-<div id="contact-edit-profile-select-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
-
-</form>
-</div>
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index a094d3393..695e20ffd 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -1831,41 +1831,30 @@ margin-left: 0px;
}
#contact-edit-banner-name { font-size: 1.5em; margin-left: 30px; font-variant: small-caps; }
-#contact-edit-photo-wrapper {position: relative; float: left; padding: 20px;}
-#contact-edit-direction-icon { position: absolute; top: 60px; left:0px;}
-#contact-edit-nav-wrapper { margin-left: 210px; }
-#contact-edit-links { float: left; margin-top: 23px; }
-#contact-edit-nav-wrapper .icon {
- border: 1px solid #babdb6;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
-}
-#contact-edit-nettype {
- font-size: 1em;
- font-variant: small-caps;
- margin-left: 30px;
- margin-bottom: 0px;
- padding-bottom: 0px;
-}
-
-#contact-edit-poll-wrapper { margin-left: 50px; width: 300px;}
-#contact-edit-last-update-text { margin-bottom: 15px; padding-top: 20px; padding-left: 10px; font-size: 0.9em; max-width: 300px; }
-#contact-edit-last-updated { font-weight: bold; }
-#contact-edit-poll-text { display: inline; font-size: 0.9em; padding-left: 10px; }
-#contact-edit-end { clear: both; margin-bottom: 65px;}
#contact-edit-update-now {
- width: 80px;
- padding: 5px 10px 5px 10px;
- margin-left: 125px;
- margin-top: 10px;
- font-style: bold;
+ padding:7px;
+ width: 165px;
+ margin: auto;
+ margin-left: 40px;
+ -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
+ -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
+ box-shadow:inset 0px 1px 0px 0px #cfcfcf;
+ background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
+ background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
+ filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
+ background-color:#bdbdbd;
+ -moz-border-radius:5px;
+ -webkit-border-radius:5px;
+ border-radius:5px;
+ display:inline-block;
+ color:#efefef;
+ text-decoration:none;
+ text-align: center;
}
#contact-edit-update-now:hover {
- color: #efefef;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
@@ -1873,20 +1862,18 @@ margin-left: 0px;
}
#contact-edit-update-now:active {
- background-color: #b20202;
position:relative;
top:1px;
}
#contact-edit-update-now a {
color: #efefef;
+ font-size: 14px;
+ text-align: center;
+ margin: auto;
}
-#contact-edit-profile-select-text > p {
- font-size: 1em;
-}
-
.contact-photo-menu-button {
position: absolute;
background-image: url("photo-menu.jpg");
@@ -2095,13 +2082,6 @@ margin-left: 0px;
font-variant: normal;
}
-#contact-view-recent {
- float: left;
- width: 150px;
- padding: 5px;
- margin-bottom: 20px;
-}
-
#contact-suggest {
float: left;
margin-left: 10px;
@@ -2142,9 +2122,6 @@ margin-left: 0px;
color: #efefef;
}
-#contact-edit-info-wrapper {
- clear: both;
-}
/* ===================================== */
/* = Register, Settings, Profile Forms = */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 17:06:35 +0000