aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-11-07 18:48:31 -0800
committerfriendica <info@friendica.com>2012-11-07 18:48:31 -0800
commit3d56ab227d03840928a9fcebb0a8508fe69f31b6 (patch)
tree79930213612e9b8791550b3fa5c64bdbf211819e /view
parentcc8a11eee2c0f8c190ac421542845bfc3ae0b5c4 (diff)
downloadvolse-hubzilla-3d56ab227d03840928a9fcebb0a8508fe69f31b6.tar.gz
volse-hubzilla-3d56ab227d03840928a9fcebb0a8508fe69f31b6.tar.bz2
volse-hubzilla-3d56ab227d03840928a9fcebb0a8508fe69f31b6.zip
turn multiple profiles into a feature, implement connection flags (block,hide,archive,etc.)
Diffstat (limited to 'view')
-rw-r--r--view/theme/redbasic/css/style.css1
-rw-r--r--view/tpl/abook_edit.tpl8
-rw-r--r--view/tpl/contact_slider.tpl2
-rw-r--r--view/tpl/main_slider.tpl2
4 files changed, 9 insertions, 4 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index a996a2d04..7dbea7acf 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -3709,3 +3709,4 @@ ul.menu-popup {
.notify-seen {
background: #DDDDDD;
}
+
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 82372a297..c534dbde7 100644
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -1,8 +1,10 @@
<h2>$header</h2>
-<br />
-<a href="connections/$contact_id/profile">$viewprof</a>
+
+<div id="connection-flag-tabs">
+$tabs
+</div>
<div id="contact-edit-wrapper">
<br />
@@ -10,6 +12,8 @@
$slide
+
+
<h3>Permissions</h3>
<form action="abook/$contact_id" method="post" >
diff --git a/view/tpl/contact_slider.tpl b/view/tpl/contact_slider.tpl
index 1334f58b1..2ccb08a90 100644
--- a/view/tpl/contact_slider.tpl
+++ b/view/tpl/contact_slider.tpl
@@ -1,4 +1,4 @@
<div id="contact-slider" class="slider" style="height: 32px; position: relative; left: 5%; width: 90%;"><input id="contact-range" type="text" name="fake-closeness" value="$val" /></div>
<script>
- $("#contact-range").slider({ from: 0, to: 99, step: 1, scale: ['$me', '$intimate', '|', '$friends', '|', '$coworkers', '|', '$oldfriends', '|', '$acquaintances', '|', '$world' ], onstatechange: function(v) { $("#contact-closeness-mirror").val(v); } });
+ $("#contact-range").slider({ from: 0, to: 99, step: 1, scale: ['$me', '|', '$intimate', '|', '$friends', '|', '$oldfriends', '|', '$acquaintances', '|', '$world' ], onstatechange: function(v) { $("#contact-closeness-mirror").val(v); } });
</script>
diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl
index 0bcf1384f..ea8b04cf3 100644
--- a/view/tpl/main_slider.tpl
+++ b/view/tpl/main_slider.tpl
@@ -1,6 +1,6 @@
<div id="main-slider" class="slider" ><input id="main-range" type="text" name="cminmax" value="$val" /></div>
<script>
- $("#main-range").slider({ from: 0, to: 99, step: 1, scale: ['$me', '$intimate', '|', '$friends', '|', '$coworkers', '|', '$oldfriends', '|', '$acquaintances', '|', '$world' ], onstatechange: function(v) {
+ $("#main-range").slider({ from: 0, to: 99, step: 1, scale: ['$me', '|', '$intimate', '|', '$friends', '|', '$oldfriends', '|', '$acquaintances', '|', '$world' ], onstatechange: function(v) {
var carr = v.split(";");
network_cmin = carr[0];
network_cmax = carr[1];