From 5ea5bb35491d928ef722b916228fb7c268dcbe86 Mon Sep 17 00:00:00 2001 From: Michael Peter Christen Date: Wed, 19 Mar 2014 16:20:17 +0100 Subject: [PATCH] redesign of menus; usage of bootstrap buttons and dropdown-menus --- htroot/ViewFile.html | 8 +- htroot/compare_yacy.html | 6 ++ htroot/env/base.css | 2 +- htroot/env/templates/header.template | 98 +++++++++++----------- htroot/env/templates/simpleheader.template | 39 +++++++-- htroot/test.html | 5 ++ htroot/yacysearch.html | 1 + 7 files changed, 102 insertions(+), 57 deletions(-) diff --git a/htroot/ViewFile.html b/htroot/ViewFile.html index 8050d4245..0853c3153 100644 --- a/htroot/ViewFile.html +++ b/htroot/ViewFile.html @@ -66,7 +66,13 @@ function updatepage(str) { :: #%env/templates/simpleheader.template%# #(/topmenu)# - + +
API diff --git a/htroot/compare_yacy.html b/htroot/compare_yacy.html index 9845da069..209aef475 100644 --- a/htroot/compare_yacy.html +++ b/htroot/compare_yacy.html @@ -13,6 +13,12 @@ :: #%env/templates/embeddedheader.template%# #(/display)# +
Websearch Comparison
diff --git a/htroot/env/base.css b/htroot/env/base.css index c046a0635..f880adf63 100644 --- a/htroot/env/base.css +++ b/htroot/env/base.css @@ -979,7 +979,7 @@ div#api:hover span { div#searchmode { position:absolute; - top:51px; + top:65px; right:20px; z-index: 100; } diff --git a/htroot/env/templates/header.template b/htroot/env/templates/header.template index 1cfc8a0f8..f01ffbb0a 100644 --- a/htroot/env/templates/header.template +++ b/htroot/env/templates/header.template @@ -10,26 +10,54 @@  Administration + + + + + + + + + +
+
- -
- - - - - - - -
@@ -40,24 +68,8 @@
- - - -
diff --git a/htroot/env/templates/simpleheader.template b/htroot/env/templates/simpleheader.template index c286a23bb..c13ec9ecf 100644 --- a/htroot/env/templates/simpleheader.template +++ b/htroot/env/templates/simpleheader.template @@ -14,12 +14,39 @@
diff --git a/htroot/test.html b/htroot/test.html index 420d848fc..fceac09d4 100644 --- a/htroot/test.html +++ b/htroot/test.html @@ -51,6 +51,11 @@
  • Trash
    • +
  • +
    + +
    +
    • diff --git a/htroot/yacysearch.html b/htroot/yacysearch.html index 01674060e..197fc5ff5 100644 --- a/htroot/yacysearch.html +++ b/htroot/yacysearch.html @@ -70,6 +70,7 @@ Your search is done using only your own peer, locally. You can switch to 'Peer-to-Peer Mode' which will cause that your search is done using the other peers in the YaCy network. #(/resource-select)# + #%env/templates/simpleheader.template%#