From cc21c96b9e26e20fe50f3639b3b94693e65c71ae Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Wed, 4 May 2016 05:07:16 +0200
Subject: [PATCH 1/5] changing user menu. not yet working

---
 templates/default-layout.hamlet | 36 ++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index ec247e9..bd525a3 100755
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -1,24 +1,36 @@
 <nav id="header">
   <div .row>
     <div .col-md-9>
-      <ul id="user-nav" .nav .nav-pills>
+      <ul #user-nav .nav .nav-pills>
         <li role="presentation">
-          <a href=@{HomeR}>Home
+          <a href=@{HomeR}>
+            Home
         $maybe su <- msu
-          <li role="presentation">
-            <a href=@{UserR username}>#{slug}<br>
-          <li role="presentation">
-            <a href=@{LogoutR}>Logout
-          <li role="presentation">
-            <a href=@{NewAlbumR}>Create album
-          <li role="presentation">
-            <a href=@{UploadR}>Upload images
+          <li .dropdown role="presentation">
+            <a .dropdown-toggle data-toggle="dropdown" role="button"
+              aria-haspopup="true" aria-expanded="false">
+                #{slug} <span class="caret"></span>
+            <ul .dropdown-menu>
+              <li>
+                <a href=@{UserR username}>
+                  Your Profile
+              <li >
+                <a href=@{NewAlbumR}>
+                  Create album
+              <li >
+                <a href=@{UploadR}>
+                  Upload images
+              <li >
+                <a href=@{LogoutR}>
+                  Logout
         $nothing
           <li role="presentation">
-            <a href=@{LoginR}>Login
+            <a href=@{LoginR}>
+              Login
           $if block == False
             <li role="presentation">
-              <a href=@{SignupR}>Signup
+              <a href=@{SignupR}>
+                Signup
     <div .col-md-3 #search>
       ^{pageBody searchWidget}
 

From 7bf072134cde688ac6c1e81fa88ae814c25e767d Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Sun, 12 Jun 2016 12:22:11 +0200
Subject: [PATCH 2/5] bake my own dropdown menu

---
 Foundation.hs                   |  3 ++-
 static/css/dropdown.css         | 14 ++++++++++++++
 templates/default-layout.hamlet | 15 +++++++--------
 3 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100644 static/css/dropdown.css

diff --git a/Foundation.hs b/Foundation.hs
index 6458f3d..9d1299e 100755
--- a/Foundation.hs
+++ b/Foundation.hs
@@ -117,7 +117,8 @@ renderLayout widget = do
             , js_picturefill_js
             ])
         $(combineStylesheets 'StaticR
-            [ css_bootstrap_min_css
+            [ css_dropdown_css
+            , css_bootstrap_min_css
             , css_style_global_css
             ])
         $(widgetFile "default-layout")
diff --git a/static/css/dropdown.css b/static/css/dropdown.css
new file mode 100644
index 0000000..b717615
--- /dev/null
+++ b/static/css/dropdown.css
@@ -0,0 +1,14 @@
+.nav {
+	list-style: none;
+	font-weight: bold;
+	margin-bottom: 10px;
+	z-index: 5;
+}
+
+.nav ul {
+	display: none;
+}
+
+.nav li:hover ul {
+	display: inline-block;
+}
diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index bd525a3..aaaaa2b 100755
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -2,15 +2,14 @@
   <div .row>
     <div .col-md-9>
       <ul #user-nav .nav .nav-pills>
-        <li role="presentation">
+        <li>
           <a href=@{HomeR}>
             Home
         $maybe su <- msu
-          <li .dropdown role="presentation">
-            <a .dropdown-toggle data-toggle="dropdown" role="button"
-              aria-haspopup="true" aria-expanded="false">
-                #{slug} <span class="caret"></span>
-            <ul .dropdown-menu>
+          <li>
+            <a>
+              #{slug} <span class="caret"></span>
+            <ul>
               <li>
                 <a href=@{UserR username}>
                   Your Profile
@@ -24,11 +23,11 @@
                 <a href=@{LogoutR}>
                   Logout
         $nothing
-          <li role="presentation">
+          <li>
             <a href=@{LoginR}>
               Login
           $if block == False
-            <li role="presentation">
+            <li>
               <a href=@{SignupR}>
                 Signup
     <div .col-md-3 #search>

From 972d5edb54c0379c7db241035b263faf0b1b6598 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Sun, 12 Jun 2016 13:52:28 +0200
Subject: [PATCH 3/5] changed dropdown activation to click

---
 static/css/dropdown.css         | 44 ++++++++++++++++++++++++++++++---
 templates/default-layout.hamlet | 14 ++++++-----
 2 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/static/css/dropdown.css b/static/css/dropdown.css
index b717615..eac7e7b 100644
--- a/static/css/dropdown.css
+++ b/static/css/dropdown.css
@@ -1,14 +1,50 @@
-.nav {
+#user-nav {
 	list-style: none;
 	font-weight: bold;
 	margin-bottom: 10px;
+	position: relative;
 	z-index: 5;
 }
 
-.nav ul {
+#user-nav ul {
 	display: none;
+	position: absolute;
 }
 
-.nav li:hover ul {
-	display: inline-block;
+#user-nav li {
+	margin-right: 20px;
+}
+
+#user-nav li a {
+	padding: 10px 20px 10px;
+	border-radius: 5px;
+	background-color: white;
+}
+
+#user-nav input[type="checkbox"]:checked + ul {
+	display: block;
+	background-color: white;
+	border-radius: 5px;
+}
+
+#user-nav a {
+	display: block;
+	text-decoration: none;
+	color: #d64760;
+}
+
+#user-nav a:hover {
+	color: black;
+	transition-timing-function: linear
+	transition-duration: 0.25s;
+}
+
+#user-nav label {
+	margin: 0;
+}
+
+.vanish {
+	/*position: absolute;
+	left: -9999px;*/
+	display: none;
 }
diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index aaaaa2b..282e23a 100755
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -1,25 +1,27 @@
 <nav id="header">
   <div .row>
     <div .col-md-9>
-      <ul #user-nav .nav .nav-pills>
+      <ul #user-nav>
         <li>
           <a href=@{HomeR}>
             Home
         $maybe su <- msu
           <li>
-            <a>
-              #{slug} <span class="caret"></span>
+            <label for="cb1">
+              <a>
+                #{slug}<span class="caret"></span>
+            <input type="checkbox" #cb1 .vanish aria-hidden="true">
             <ul>
               <li>
                 <a href=@{UserR username}>
                   Your Profile
-              <li >
+              <li>
                 <a href=@{NewAlbumR}>
                   Create album
-              <li >
+              <li>
                 <a href=@{UploadR}>
                   Upload images
-              <li >
+              <li>
                 <a href=@{LogoutR}>
                   Logout
         $nothing

From 54beddade386b7eb632530f9e70e2e847c3257e4 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Sun, 12 Jun 2016 14:52:02 +0200
Subject: [PATCH 4/5] small fixes

---
 static/css/dropdown.css       | 2 +-
 static/css/style-desktop.css  | 2 +-
 static/css/style-global.css   | 4 ++++
 templates/form-widget.cassius | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/static/css/dropdown.css b/static/css/dropdown.css
index eac7e7b..88453f6 100644
--- a/static/css/dropdown.css
+++ b/static/css/dropdown.css
@@ -3,7 +3,6 @@
 	font-weight: bold;
 	margin-bottom: 10px;
 	position: relative;
-	z-index: 5;
 }
 
 #user-nav ul {
@@ -25,6 +24,7 @@
 	display: block;
 	background-color: white;
 	border-radius: 5px;
+	z-index: 99;
 }
 
 #user-nav a {
diff --git a/static/css/style-desktop.css b/static/css/style-desktop.css
index 2418e93..0d7ab71 100755
--- a/static/css/style-desktop.css
+++ b/static/css/style-desktop.css
@@ -101,7 +101,7 @@
 	#header
 	{
 		padding: 2em 3em;
-		xmin-height: 212px;
+		min-height: 212px;
 		vertical-align: middle;
 	}
 
diff --git a/static/css/style-global.css b/static/css/style-global.css
index 1dab272..aea47c8 100755
--- a/static/css/style-global.css
+++ b/static/css/style-global.css
@@ -277,3 +277,7 @@
 		outline: 0px none;
 		box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075) inset, 0px 0px 8px rgba(255,249,183, 0.6);
 	}
+
+	nav {
+		min-height: 0 !important;
+	}
diff --git a/templates/form-widget.cassius b/templates/form-widget.cassius
index 9d20125..b783115 100755
--- a/templates/form-widget.cassius
+++ b/templates/form-widget.cassius
@@ -1,5 +1,5 @@
 /*templates/form-widget.cassius*/
 
 #main, #reel, #header
-  overflow-y: auto !important
+  /*overflow-y: auto !important*/
   height: auto !important

From bdf9cb2d41519baa9ca7321285cbe4a7a43fc9ba Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Sun, 12 Jun 2016 15:17:07 +0200
Subject: [PATCH 5/5] fixed forms

---
 templates/bulkUpload.hamlet   | 3 +--
 templates/dUpload.hamlet      | 3 +--
 templates/form-widget.cassius | 3 +++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/templates/bulkUpload.hamlet b/templates/bulkUpload.hamlet
index 05d4d7b..82910a1 100755
--- a/templates/bulkUpload.hamlet
+++ b/templates/bulkUpload.hamlet
@@ -1,5 +1,4 @@
 <div id="header" class="item" data-width="400">
   <form class="inner" method=post enctype=#{enctype}>
-    <h3>Upload multiple images
-    <p>Here you can upload your images.
+    Upload multiple images
     ^{uploadWidget}
diff --git a/templates/dUpload.hamlet b/templates/dUpload.hamlet
index d4b835a..4c9ee94 100755
--- a/templates/dUpload.hamlet
+++ b/templates/dUpload.hamlet
@@ -1,5 +1,4 @@
 <div id="header" class="item" data-width="400">
   <form class="inner" method=post enctype=#{enctype}>
-    <h1>Image upload to album #{albumTitle album}
-    <p>Here you can upload your image.
+    Image upload to album #{albumTitle album}
     ^{dUploadWidget}
diff --git a/templates/form-widget.cassius b/templates/form-widget.cassius
index b783115..72a9e81 100755
--- a/templates/form-widget.cassius
+++ b/templates/form-widget.cassius
@@ -3,3 +3,6 @@
 #main, #reel, #header
   /*overflow-y: auto !important*/
   height: auto !important
+
+#main
+  margin-top: -220px !important;