From 119ddcd1478c64fea99618568713bb9b7ccaae6e Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 7 Feb 2013 17:12:10 -0800
Subject: finish the abook_edit quicklink mess, get rid of the experimental nav
 bar opacity. Bad idea.

---
 view/js/mod_connections.js        |  7 -------
 view/theme/redbasic/css/style.css | 32 +++++++++++++++++++++++++-------
 view/tpl/abook_edit.tpl           | 10 +++++-----
 view/tpl/smarty3/abook_edit.tpl   | 10 +++++-----
 4 files changed, 35 insertions(+), 24 deletions(-)

(limited to 'view')

diff --git a/view/js/mod_connections.js b/view/js/mod_connections.js
index e5d6ad55b..8f35c19cc 100644
--- a/view/js/mod_connections.js
+++ b/view/js/mod_connections.js
@@ -34,7 +34,6 @@ function connectFullShare() {
 	$('#me_id_perms_post_mail').attr('checked','checked');
 	$('#me_id_perms_chat').attr('checked','checked');
 	$('#me_id_perms_view_storage').attr('checked','checked');
-	//	$('#abook-edit-form').submit();
 }
 
 function connectCautiousShare() {
@@ -46,8 +45,6 @@ function connectCautiousShare() {
 	$('#me_id_perms_send_stream').attr('checked','checked');
 	$('#me_id_perms_post_comments').attr('checked','checked');
 	$('#me_id_perms_post_mail').attr('checked','checked');
-	//	$('#abook-edit-form').submit();
-
 }
 
 function connectForum() {
@@ -62,14 +59,10 @@ function connectForum() {
 	$('#me_id_perms_post_comments').attr('checked','checked');
 	$('#me_id_perms_post_mail').attr('checked','checked');
 	$('#me_id_perms_tag_deliver').attr('checked','checked');
-	//	$('#abook-edit-form').submit();
-
 }
 
 
 function connectFollowOnly() {
 	$('#me_id_perms_send_stream').attr('checked','checked');
-	//	$('#abook-edit-form').submit();
-
 }
 
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index a4c31787b..2dfd85d85 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -3508,8 +3508,8 @@ nav {
   width: 100%;
   height: 32px;
   position: fixed;
-	opacity: 0.6;
-	filter:alpha(opacity=60);
+//	opacity: 0.6;
+//	filter:alpha(opacity=60);
 
   left: 0px;
   top: 0px;
@@ -3523,6 +3523,23 @@ nav {
 
 /* TODO find a better way to do this without different code for every single browser.  */
 
+  background-image: linear-gradient(bottom, #f88 26%, #b00 82%);
+  background-image: -o-linear-gradient(bottom, #f88 26%, #b00 82%);
+  background-image: -moz-linear-gradient(bottom, #f88 26%, #b00 82%);
+  background-image: -webkit-linear-gradient(bottom, #f88 26%, #b00 82%);
+  background-image: -ms-linear-gradient(bottom, #f88 26%, #b00 82%);
+
+  background-image: -webkit-gradient(
+linear,
+left bottom,
+left top,
+color-stop(0.26, #f88),
+color-stop(0.82, #b00)
+);
+}
+
+nav:hover {
+
   background-image: linear-gradient(bottom, #f00 26%, #b00 82%);
   background-image: -o-linear-gradient(bottom, #f00 26%, #b00 82%);
   background-image: -moz-linear-gradient(bottom, #f00 26%, #b00 82%);
@@ -3538,10 +3555,6 @@ color-stop(0.82, #b00)
 );
 }
 
-nav:hover {
-	opacity: 1.0;
-	filter:alpha(opacity=100);
-}
 nav a,
 nav a:active,
 nav a:visited,
@@ -3591,8 +3604,13 @@ nav .nav-menu {
   padding: 5px;
   margin: 3px 15px 0px;
   font-size: 14px;
-  border-bottom: 3px solid #ff0000;
+  border-bottom: 3px solid #f88;
+}
+
+nav:hover .nav-menu {
+  border-bottom: 3px solid #f00;
 }
+
 nav .nav-menu.selected {
   border-bottom: 4px solid #CCCCCC;
 }
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 6dffec798..ba1baf9ee 100644
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -46,11 +46,11 @@ $slide
 <b>$quick</b>
 <ul>
 {{ if $self }}
-<li><a href="#" onclick="connectForum(); return false;">$forum</a></li>
+<li><a href="#" onclick="connectForum(); $('#abook-edit-form').submit();">$forum</a></li>
 {{ endif }}
-<li><a href="#" onclick="connectFullShare(); return false;">$full</a></li>
-<li><a href="#" onclick="connectCautiousShare(); return false;">$cautious</a></li>
-<li><a href="#" onclick="connectFollowOnly(); return false;">$follow</a></li>
+<li><span class="fakelink" onclick="connectFullShare(); $('#abook-edit-form').submit();">$full</span></li>
+<li><a href="#" onclick="connectCautiousShare(); $('#abook-edit-form').submit();">$cautious</a></li>
+<li><a href="#" onclick="connectFollowOnly(); $('#abook-edit-form').submit();">$follow</a></li>
 </ul>
 
 <div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">$advanced</div>
@@ -67,7 +67,7 @@ $slide
 
 </div>
 
-<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
+<input class="contact-edit-submit" type="submit" name="done" value="$submit" />
 
 </form>
 </div>
diff --git a/view/tpl/smarty3/abook_edit.tpl b/view/tpl/smarty3/abook_edit.tpl
index 2e471e4cc..a27b556f2 100644
--- a/view/tpl/smarty3/abook_edit.tpl
+++ b/view/tpl/smarty3/abook_edit.tpl
@@ -51,11 +51,11 @@
 <b>{{$quick}}</b>
 <ul>
 {{if $self}}
-<li><a href="#" onclick="connectForum(); return false;">{{$forum}}</a></li>
+<li><a href="#" onclick="connectForum(); $('#abook-edit-form').submit();">{{$forum}}</a></li>
 {{/if}}
-<li><a href="#" onclick="connectFullShare(); return false;">{{$full}}</a></li>
-<li><a href="#" onclick="connectCautiousShare(); return false;">{{$cautious}}</a></li>
-<li><a href="#" onclick="connectFollowOnly(); return false;">{{$follow}}</a></li>
+<li><span class="fakelink" onclick="connectFullShare(); $('#abook-edit-form').submit();">{{$full}}</span></li>
+<li><a href="#" onclick="connectCautiousShare(); $('#abook-edit-form').submit();">{{$cautious}}</a></li>
+<li><a href="#" onclick="connectFollowOnly(); $('#abook-edit-form').submit();">{{$follow}}</a></li>
 </ul>
 
 <div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">{{$advanced}}</div>
@@ -72,7 +72,7 @@
 
 </div>
 
-<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
 
 </form>
 </div>
-- 
cgit v1.2.3