aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/directory_header.tpl2
-rw-r--r--view/head.tpl96
-rw-r--r--view/htconfig.tpl4
-rw-r--r--view/profile-in-netdir.tpl16
-rw-r--r--view/profile_edit.tpl2
-rw-r--r--view/theme/default/style.css8
-rw-r--r--view/wall_item.tpl1
-rw-r--r--view/wallwall_item.tpl2
8 files changed, 34 insertions, 97 deletions
diff --git a/view/directory_header.tpl b/view/directory_header.tpl
index 8fc1d2cfc..c4217ac48 100644
--- a/view/directory_header.tpl
+++ b/view/directory_header.tpl
@@ -1,5 +1,7 @@
<h1>Site Directory</h1>
+<ul><li><div id="global-directory-link"><a href="http://dir.dfrn.org">Global Community Directory</a></div></li></ul>
+
$finding
<div id="directory-search-wrapper">
diff --git a/view/head.tpl b/view/head.tpl
index d3c17d926..dd6162f09 100644
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -8,100 +8,4 @@
<script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
<script type="text/javascript" src="$baseurl/include/main.js" ></script>
-<script type="text/javascript">
-
- var src = null;
- var prev = null;
- var livetime = null;
- var msie = false;
-
- $(document).ready(function() {
- $.ajaxSetup({cache: false});
- msie = $.browser.msie ;
- NavUpdate();
-
-
-
- });
-
- function NavUpdate() {
-
- if($('#live-network').length) { src = 'network'; liveUpdate(); }
- if($('#live-profile').length) { src = 'profile'; liveUpdate(); }
-
- $.get("ping",function(data) {
- $(data).find('result').each(function() {
- var net = $(this).find('net').text();
- 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,30000);
-
- }
-
- function liveUpdate() {
- if(src == null) { return; }
- if($('.comment-edit-text-full').length) {
- livetime = setTimeout(liveUpdate, 10000);
- return;
- }
- prev = 'live-' + src;
-
- $.get('update_' + src + '?msie=' + ((msie) ? 1 : 0),function(data) {
- $('.wall-item-outside-wrapper',data).each(function() {
- var ident = $(this).attr('id');
- if($('#' + ident).length == 0) {
- $('img',this).each(function() {
- $(this).attr('src',$(this).attr('dst'));
- });
- $('#' + prev).after($(this));
- }
- else {
-
- $('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago'));
- $('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
- $('#' + ident + ' ' + '.my-comment-photo').each(function() {
- $(this).attr('src',$(this).attr('dst'));
- });
-
-
- }
- prev = ident;
- });
- });
-
- }
-
- function confirmDelete() {
- return confirm("Delete this item?");
- }
-
- function imgbright(node) {
- $(node).attr("src",$(node).attr("src").replace('hide','show'));
- $(node).css('width',24);
- $(node).css('height',24);
- }
-
- function imgdull(node) {
- $(node).attr("src",$(node).attr("src").replace('show','hide'));
- $(node).css('width',16);
- $(node).css('height',16);
- }
-
-
-
-
-
-
-</script>
diff --git a/view/htconfig.tpl b/view/htconfig.tpl
index f555ace83..42c32da2e 100644
--- a/view/htconfig.tpl
+++ b/view/htconfig.tpl
@@ -42,3 +42,7 @@ $a->config['max_import_size'] = 65535;
// Location of PHP command line processor
$a->config['php_path'] = '$phpath';
+
+// Location of global directory submission page.
+
+$a->config['system']['directory_submit_url'] = 'http://dir.dfrn.org/submit'; \ No newline at end of file
diff --git a/view/profile-in-netdir.tpl b/view/profile-in-netdir.tpl
new file mode 100644
index 000000000..d5a320a3f
--- /dev/null
+++ b/view/profile-in-netdir.tpl
@@ -0,0 +1,16 @@
+<p id="profile-in-directory">
+Publish this profile in global social directory?
+</p>
+
+ <div id="profile-in-netdir-yes-wrapper">
+ <label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">Yes</label>
+ <input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" $yes_selected value="1" />
+
+ <div id="profile-in-netdir-break" ></div>
+ </div>
+ <div id="profile-in-netdir-no-wrapper">
+ <label id="profile-in-netdir-no-label" for="profile-in-netdir-no">No</label>
+ <input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" $no_selected value="0" />
+
+ <div id="profile-in-netdir-end"></div>
+ </div>
diff --git a/view/profile_edit.tpl b/view/profile_edit.tpl
index 44ca3922b..a28471325 100644
--- a/view/profile_edit.tpl
+++ b/view/profile_edit.tpl
@@ -44,6 +44,8 @@ $dob $age
$profile_in_dir
+$profile_in_net_dir
+
$hide_friends
<div class="profile-edit-submit-wrapper" >
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index 59ec1dd1e..4c386afa6 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -501,6 +501,8 @@ input#dfrn-url {
#profile-edit-religion,
#profile-in-dir-yes,
#profile-in-dir-no,
+#profile-in-netdir-yes,
+#profile-in-netdir-no,
#hide-friends-yes,
#hide-friends-no {
float: left;
@@ -509,6 +511,8 @@ input#dfrn-url {
#profile-in-dir-yes-label,
#profile-in-dir-no-label,
+#profile-in-netdir-yes-label,
+#profile-in-netdir-no-label,
#hide-friends-yes-label,
#hide-friends-no-label {
margin-left: 125px;
@@ -537,6 +541,8 @@ input#dfrn-url {
#profile-edit-homepage-end,
#profile-in-dir-break,
#profile-in-dir-end,
+#profile-in-netdir-break,
+#profile-in-netdir-end,
#hide-friends-break,
#hide-friends-end {
clear: both;
@@ -829,7 +835,7 @@ input#dfrn-url {
}
#directory-search-wrapper {
- margin-left: 350px;
+ margin-top: 20px;
margin-right: 20px;
margin-bottom: 50px;
}
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index 84d0f2879..c646bbee3 100644
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -8,6 +8,7 @@
<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
<a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-$id" >$name</span></a>
<div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
+ <div class="wall-item-location" id="wall-item-location-$id">$location</div>
</div>
<div class="wall-item-content" id="wall-item-content-$id" >
<div class="wall-item-title" id="wall-item-title-$id">$title</div>
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl
index 4704c0c7c..30970f6ae 100644
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -11,6 +11,8 @@
<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
<a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-$id" >$name</span></a> to <a href="$owner_url" title="View $owner_name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-ownername-$id">$owner_name</span></a> via Wall-To-Wall:<br />
<div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
+ <div class="wall-item-location" id="wall-item-location-$id">$location</div>
+
</div>
<div class="wall-item-content" id="wall-item-content-$id" >
<div class="wall-item-title" id="wall-item-title-$id">$title</div>