diff --git a/daemon.py b/daemon.py index 24f94156..4a7df439 100644 --- a/daemon.py +++ b/daemon.py @@ -464,6 +464,22 @@ class PubServer(BaseHTTPRequestHandler): return self._404() return + # icon images + # Note that this comes before the busy flag to avoid conflicts + if '/icons/' in self.path: + if self.path.endswith('.png'): + mediaStr=self.path.split('/icons/')[1] + mediaFilename= \ + self.server.baseDir+'/img/icons/'+mediaStr + if os.path.isfile(mediaFilename): + if mediaFilename.endswith('.png'): + self._set_headers('image/png') + with open(mediaFilename, 'rb') as avFile: + mediaBinary = avFile.read() + self.wfile.write(mediaBinary) + return + self._404() + return # show avatar or background image # Note that this comes before the busy flag to avoid conflicts if '/users/' in self.path: diff --git a/epicyon-profile.css b/epicyon-profile.css index 168e2e66..55c63991 100644 --- a/epicyon-profile.css +++ b/epicyon-profile.css @@ -241,16 +241,17 @@ input[type=text], select, textarea { } input[type=submit] { - background-color: #4CAF50; + background-color: #555; color: white; padding: 12px 20px; border: none; border-radius: 4px; cursor: pointer; + font-size: 18px; } input[type=submit]:hover { - background-color: #45a049; + background-color: #555; } .vertical-center { @@ -261,3 +262,46 @@ input[type=submit]:hover { min-width: 600px; margin: 0 auto; } + +.dropbtn { + background-color: #555; + color: white; + padding: 12px 20px; + border: none; + border-radius: 4px; + cursor: pointer; + font-size: 18px; +} + +/* The container
- needed to position the dropdown content */ +.dropdown { + position: relative; + display: inline-block; +} + +/* Dropdown Content (Hidden by Default) */ +.dropdown-content { + display: none; + position: absolute; + background-color: #f1f1f1; + min-width: 260px; + box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); + z-index: 1; +} + +/* Links inside the dropdown */ +.dropdown-content a { + color: black; + padding: 12px 16px; + text-decoration: none; + display: block; +} + +/* Change color of dropdown links on hover */ +.dropdown-content a:hover {background-color: #ddd;} + +/* Show the dropdown menu on hover */ +.dropdown:hover .dropdown-content {display: block;} + +/* Change the background color of the dropdown button when the dropdown content is shown */ +.dropdown:hover .dropbtn {background-color: #3e8e41;} diff --git a/img/icons/download.png b/img/icons/download.png new file mode 100644 index 00000000..03b2c4ce Binary files /dev/null and b/img/icons/download.png differ diff --git a/img/icons/like.png b/img/icons/like.png new file mode 100644 index 00000000..2ffba428 Binary files /dev/null and b/img/icons/like.png differ diff --git a/img/icons/like_inactive.png b/img/icons/like_inactive.png new file mode 100644 index 00000000..69656278 Binary files /dev/null and b/img/icons/like_inactive.png differ diff --git a/img/icons/scope_dm.png b/img/icons/scope_dm.png new file mode 100644 index 00000000..1d8fa627 Binary files /dev/null and b/img/icons/scope_dm.png differ diff --git a/img/icons/scope_followers.png b/img/icons/scope_followers.png new file mode 100644 index 00000000..623cad92 Binary files /dev/null and b/img/icons/scope_followers.png differ diff --git a/img/icons/scope_public.png b/img/icons/scope_public.png new file mode 100644 index 00000000..fd999f7c Binary files /dev/null and b/img/icons/scope_public.png differ diff --git a/img/icons/scope_unlisted.png b/img/icons/scope_unlisted.png new file mode 100644 index 00000000..2b82a560 Binary files /dev/null and b/img/icons/scope_unlisted.png differ diff --git a/webinterface.py b/webinterface.py index 51e95f04..482d2c49 100644 --- a/webinterface.py +++ b/webinterface.py @@ -92,8 +92,20 @@ def htmlNewPost(baseDir: str,path: str) -> str: '' \ ' ' \ '' \ - ' ' \ + '
' \ + ' ' \ ' ' \ + ' ' \ + '
' \ '
' \ '' newPostForm+=htmlFooter() @@ -399,8 +411,7 @@ def htmlTimeline(session,baseDir: str,wfRequest: {},personCache: {}, \ '
' \ '
' \ '
\n' \ - '
'+ \ - newPostStr+ \ + '
'+newPostStr+ \ ' ' \ ' ' \ ' ' \