aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2010-07-20 05:21:19 -0700
committerMike Macgirvin <mike@macgirvin.com>2010-07-20 05:21:19 -0700
commit466267fbb5b5cc466196e40b6a8fe96f25c57e2f (patch)
tree8fc00033648bd7716fdeac8eaddca054b2fbf1be /view
parentba8da761e669b22e16e1075e0e1e79d8b458af3e (diff)
downloadvolse-hubzilla-466267fbb5b5cc466196e40b6a8fe96f25c57e2f.tar.gz
volse-hubzilla-466267fbb5b5cc466196e40b6a8fe96f25c57e2f.tar.bz2
volse-hubzilla-466267fbb5b5cc466196e40b6a8fe96f25c57e2f.zip
lotsoflittlestuff
Diffstat (limited to 'view')
-rw-r--r--view/atom_feed.tpl9
-rw-r--r--view/contact_edit.tpl2
-rw-r--r--view/directory_item.tpl2
-rw-r--r--view/head.tpl16
-rw-r--r--view/style.css24
5 files changed, 46 insertions, 7 deletions
diff --git a/view/atom_feed.tpl b/view/atom_feed.tpl
index 00ac6c406..a620a2578 100644
--- a/view/atom_feed.tpl
+++ b/view/atom_feed.tpl
@@ -6,10 +6,15 @@
<id>$feed_id</id>
<title>$feed_title</title>
+ <icon>$photo</icon>
+ <dfrn:icon-updated>0000-00-00T00:00:00Z</dfrn:icon-updated>
<updated>$feed_updated</updated>
<author>
<name>$name</name>
+ <dfrn:name-updated>0000-00-00T00:00:00Z</dfrn:name-updated>
<uri>$profile_page</uri>
- <dfrn:avatar>$photo</dfrn:avatar>
- </author>
+ <dfrn:uri-updated>0000-00-00T00:00:00Z</dfrn:uri-updated>
+ <dfrn:avatar>$thumb</dfrn:avatar>
+ <dfrn:avatar-updated>0000-00-00T00:00:00Z</dfrn:avatar-updated>
+ </author>
diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl
index 4a94f7083..26ee2ef5c 100644
--- a/view/contact_edit.tpl
+++ b/view/contact_edit.tpl
@@ -30,7 +30,7 @@ $blocked
<div id="contact-edit-profile-select-text">
<h4>Profile Visibility</h4>
-<p>Please choose the profile you would like to display to $name - when he/she connects securely to your profile page.
+<p>Please choose the profile you would like to display to $name when viewing your profile securely.
</p>
</div>
$profile_select
diff --git a/view/directory_item.tpl b/view/directory_item.tpl
index 295a66451..2494bc4b7 100644
--- a/view/directory_item.tpl
+++ b/view/directory_item.tpl
@@ -1,7 +1,7 @@
<div class="directory-item" id="directory-item-$id" >
<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" >
-<div class="directory-photo" id="directory-photo-$id" ><a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" ><img src="$photo" alt="$alt-text" title="$alt-text" /></a>
+<div class="directory-photo" id="directory-photo-$id" ><a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" ><img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" /></a>
</div>
</div>
<div class="directory-photo-end"></div>
diff --git a/view/head.tpl b/view/head.tpl
index b384d6fc0..6be3f7940 100644
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -9,7 +9,7 @@
<script type="text/javascript" src="$baseurl/include/main.js" ></script>
<script type="text/javascript">
-// $(document).ready(function() { setTimeout(NavUpdate,10 * 1000); });
+ $(document).ready(function() { NavUpdate(); });
function NavUpdate()
{
@@ -17,10 +17,20 @@ function NavUpdate()
{
$(data).find('result').each(function() {
var net = $(this).find('net').text();
- alert(net);
+ if(net == 0) { net = ''; }
+ $('#net-update').html(net);
+ var home = $(this).find('home').text();
+ if(home == 0) { home = ''; }
+ $('#home-update').html(home);
+ var mail = $(this).find('mail').text();
+ if(mail == 0) { mail = ''; }
+ $('#mail-update').html(mail);
+ var intro = $(this).find('intro').text();
+ if(intro == 0) { intro = ''; }
+ $('#notify-update').html(intro);
});
}) ;
- setTimeout(NavUpdate,10 * 1000);
+ setTimeout(NavUpdate,30000);
}
</script>
diff --git a/view/style.css b/view/style.css
index 58579ae48..bde06ec5c 100644
--- a/view/style.css
+++ b/view/style.css
@@ -77,6 +77,22 @@ footer {
}
+.nav-ajax-left {
+ margin-left: 1px;
+ float: left;
+ font-size: 0.6em;
+ font-weight: bold;
+ color: #FF0000;
+}
+
+.nav-ajax-right {
+ margin-left: 1px;
+ float: right;
+ font-size: 0.6em;
+ font-weight: bold;
+ color: #FF0000;
+}
+
.nav-commlink {
float: left;
margin-left: 10px;
@@ -597,6 +613,11 @@ input#dfrn-url {
#directory-search-end {
}
+.directory-photo-img {
+ border: none;
+}
+
+
.pager {
padding: 10px;
text-align: center;
@@ -835,6 +856,9 @@ input#dfrn-url {
overflow: auto;
}
+#group-new-submit-wrapper {
+ margin-top: 30px;
+}
#acl-allow-group-label,
#acl-allow-contact-label,