summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrendan Early <mymindstorm@evermiss.net>2020-02-13 14:54:03 -0600
committerKevin Fenzi <kevin@scrye.com>2020-02-19 00:09:17 +0000
commit517ef055861783ee1e911bbeaf977f9da97b4ae5 (patch)
tree1b2e6241b8c25a573b441ce72d1bba25805fa844
parentf964f41d3387ee4e6e93425212f44d9597a2f9a9 (diff)
downloadansible-master.zip
ansible-master.tar.gz
ansible-master.tar.xz
fedorapeople.org fixesHEADmaster
* add userdefs files to ansible * fix malformed html under /groups * fix footer on long pages * remove fedmenu
-rwxr-xr-xroles/people/files/userdefs/404Error.html6
-rwxr-xr-xroles/people/files/userdefs/FOOTER.html16
-rwxr-xr-xroles/people/files/userdefs/HEADER.html30
-rwxr-xr-xroles/people/files/userdefs/css/fedora.css154
-rwxr-xr-xroles/people/files/userdefs/css/style.css121
-rw-r--r--roles/people/tasks/main.yml5
-rw-r--r--roles/people/templates/people.conf10
7 files changed, 337 insertions, 5 deletions
diff --git a/roles/people/files/userdefs/404Error.html b/roles/people/files/userdefs/404Error.html
new file mode 100755
index 0000000..651b052
--- /dev/null
+++ b/roles/people/files/userdefs/404Error.html
@@ -0,0 +1,6 @@
+<!--#include virtual="/userdefs/HEADER.html"-->
+ <h2>Error 404</h2>
+
+ <p>Sorry, the file you are looking for probably no longer exists.</p>
+
+<!--#include virtual="/userdefs/FOOTER.html"-->
diff --git a/roles/people/files/userdefs/FOOTER.html b/roles/people/files/userdefs/FOOTER.html
new file mode 100755
index 0000000..79c8804
--- /dev/null
+++ b/roles/people/files/userdefs/FOOTER.html
@@ -0,0 +1,16 @@
+ </div>
+ </div>
+ <div id="bottom">
+ <div id="footer">
+ <p class="disclaimer">
+ The Fedora Project is maintained and driven by the community and sponsored by Red Hat. This is a community maintained site. Red Hat is not responsible for content.
+ </p>
+ <ul>
+ <li class="first"><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
+ <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>
+
+ </ul>
+ </div>
+ </div>
+ </body>
+</html>
diff --git a/roles/people/files/userdefs/HEADER.html b/roles/people/files/userdefs/HEADER.html
new file mode 100755
index 0000000..b3df53e
--- /dev/null
+++ b/roles/people/files/userdefs/HEADER.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+
+ <head>
+ <title>Fedora People</title>
+ <style type="text/css" media="screen">
+ @import url("http://fedorapeople.org/userdefs/css/fedora.css");
+ @import url("http://fedorapeople.org/userdefs/css/style.css");
+ </style>
+ </head>
+
+ <body>
+
+ <div id="wrapper">
+ <div id="head">
+ <h1><a href="http://fedoraproject.org/">Fedora</a></h1>
+ </div>
+ <div id="sidebar">
+ <div class="nav">
+ <h2>Navigation</h2>
+ <ul>
+
+ <li><strong><a href="/">Home</a></strong></li>
+
+ </ul>
+ </div>
+ </div>
+ <div id="content">
+ <div id="pageLogin">
+ </div>
diff --git a/roles/people/files/userdefs/css/fedora.css b/roles/people/files/userdefs/css/fedora.css
new file mode 100755
index 0000000..66994f2
--- /dev/null
+++ b/roles/people/files/userdefs/css/fedora.css
@@ -0,0 +1,154 @@
+*
+{
+ margin: 0;
+ padding: 0;
+}
+
+html, body
+{
+ height: 100%;
+}
+
+body
+{
+ height: 100%;
+ font-size: 76%;
+ background: #FFFFFF url(//fedoraproject.org/static/images/border-left.png) 0 0 repeat-y;
+}
+
+a img
+{
+ border: none;
+}
+
+#wrapper
+{
+ margin-left: 18px;
+ font: normal 2.3ex/1.5 sans-serif;
+ min-height: 100%;
+ background: #FFFFFF url(//fedoraproject.org/static/images/border-right.png) 100% 0 repeat-y;
+ padding-right: 18px;
+}
+
+#head
+{
+ border-top: 10px solid #337ACC;
+ padding: 1ex 2ex 17px;
+ background: #FFFFFF url(//fedoraproject.org/static/images/line.png) 0 100% repeat-x;
+}
+
+#head h1 a
+{
+ display: block;
+ text-indent: -9999px;
+ background: url(//fedoraproject.org/static/images/fedora-logo.png) 20px 50% no-repeat;
+ height: 73px;
+ width: 175px;
+ overflow: hidden;
+}
+
+#content
+{
+ margin: 0 2ex;
+ background: red;
+ padding: 1ex 1ex 120px;
+ color: #666666;
+ background: #FFFFFF;
+}
+
+#content h2
+{
+ font-size: 3.25ex;
+}
+
+#content h2 div {
+ font-size: 1ex;
+ font-weight: normal;
+}
+
+#content h3
+{
+ color: #337acc;
+ margin: 1.5ex 0;
+ font-size: 2.5ex;
+}
+
+#content p
+{
+ margin: 1ex 5ex 1ex 0;
+}
+
+#content img
+{
+ margin: auto; /* 2ex 0;*/ /* Fix by andreasn */
+}
+
+#content a
+{
+ color: #337ACC;
+}
+
+#footer
+{
+ position: relative;
+ font: normal 1.5ex/1.5 sans-serif;
+ clear: both;
+ text-align: center;
+ background: #FFFFFF url(//fedoraproject.org/static/images/line-bottom.png) 0 0 repeat-x;
+ margin: -90px 0 0;
+ border-bottom: 10px solid #337ACC;
+ height: 80px;
+ color: #AAAAAA;
+}
+
+#bottom
+{
+ background: #FFFFFF url(//fedoraproject.org/static/images/border-right.png) 100% 0 repeat-y;
+ margin-left: 18px;
+ padding-right: 18px;
+}
+
+#footer ul
+{
+ list-style: none;
+}
+
+#footer li
+{
+ display: inline;
+ border-left: 1px solid #AAAAAA;
+ padding: 0 0.75ex;
+ margin-left: -1px;
+}
+
+#footer li.first
+{
+ border-left: none;
+}
+
+#footer a
+{
+ color: #223344;
+}
+
+#footer a:hover
+{
+ color: #112233;
+}
+
+#footer .copy
+{
+ padding-top: 3ex;
+}
+
+.ToolTip {
+ display: block;
+ position: absolute;
+ border: 1px solid black;
+ background-color: lightyellow;
+ width: 200px;
+}
+
+.invisible {
+ display: none;
+}
diff --git a/roles/people/files/userdefs/css/style.css b/roles/people/files/userdefs/css/style.css
new file mode 100755
index 0000000..00692de
--- /dev/null
+++ b/roles/people/files/userdefs/css/style.css
@@ -0,0 +1,121 @@
+#sidebar
+{
+ float: left;
+ width: 25ex;
+ margin: 2ex 0;
+ background: #FFFFFF;
+}
+
+#content
+{
+ margin-left: 25ex!important;
+}
+
+#content ul
+{
+ list-style: square;
+ margin: 1ex 3ex;
+ line-height: 1;
+}
+
+#content table
+{
+ border-collapse: collapse;
+}
+
+#content th, #content td
+{
+ border: 1px solid #DDDDDD;
+ padding: 0.5ex 2ex;
+}
+
+.nav
+{
+ margin: 0 10px;
+ padding: 0 1.5ex;
+}
+
+.nav h2
+{
+ border-bottom: 1px dotted #AAAAAA;
+ color: #444444;
+ font-size: 1.5ex;
+ margin: 2ex 0 1ex;
+ text-transform: uppercase;
+ font-weight: normal;
+}
+
+.nav ul
+{
+ list-style: url(//fedoraproject.org/static/images/arrow.png);
+ margin-left: 15px;
+}
+
+.nav li
+{
+ margin: 0.25ex 1ex;
+ color: #777777;
+ font-size: 1.5ex;
+}
+
+.nav a
+{
+ font-weight: bold;
+ margin-right: 0.75ex;
+ color: #729FCF;
+}
+
+#content h3
+{
+ margin: 0!important;
+}
+
+#pageLogin
+{
+ float: right;
+}
+
+.pkglist
+{
+ border: 1px solid #CCCCCC;
+ width: 100%;
+ margin: 1.5ex 0;
+ text-align: center;
+}
+
+.pkglist th, .pkglist td
+{
+ border: none!important;
+}
+
+.pkglist table th, .pkglist table td
+{
+ border: 1px solid #CCCCCC;
+}
+
+.actions
+{
+ list-style: none;
+ line-height: 1;
+ margin: 1ex 0!important;
+}
+
+.actions li
+{
+ display: inline;
+ margin-right: 1ex;
+}
+
+a.bodhi
+{
+ padding-left: 20px;
+ background: url(../images/bodhi.png) 0 50% no-repeat;
+}
+
+a.koji
+{
+ padding-left: 20px;
+ background: url(../images/koji.png) 0 50% no-repeat;
+}
+
+
diff --git a/roles/people/tasks/main.yml b/roles/people/tasks/main.yml
index 37e302a..2a6fd9f 100644
--- a/roles/people/tasks/main.yml
+++ b/roles/people/tasks/main.yml
@@ -257,6 +257,11 @@
tags:
- people
+- name: copy static files for user pages
+ copy: src=userdefs/ dest=/srv/people/site/userdefs
+ tags:
+ - people
+
- name: setup script to make main fedorapeople.org index page
copy: src=make-people-page.py dest=/usr/local/bin/make-people-page.py mode=755
tags:
diff --git a/roles/people/templates/people.conf b/roles/people/templates/people.conf
index 46a7e76..d8bcfec 100644
--- a/roles/people/templates/people.conf
+++ b/roles/people/templates/people.conf
@@ -73,7 +73,7 @@ NameVirtualHost *:80
<Directory /project>
AllowOverride FileInfo AuthConfig Limit Indexes
Options MultiViews Indexes FollowSymLinks IncludesNoExec
- IndexOptions NameWidth=* FancyIndexing
+ IndexOptions NameWidth=* FancyIndexing +SuppressHTMLPreamble
Require method GET POST OPTIONS
</Directory>
@@ -111,8 +111,8 @@ NameVirtualHost *:80
<Directory /srv/web/skvidal/public_html>
AllowOverride FileInfo AuthConfig Limit Indexes
Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
- HeaderName /_defaults/HEADER.shtml
- ReadmeName /_defaults/FOOTER.shtml
+ HeaderName /_defaults/HEADER.html
+ ReadmeName /_defaults/FOOTER.html
IndexOptions +FoldersFirst +IgnoreCase +NameWidth=* +SuppressIcon +VersionSort
IndexOptions +XHTML +SuppressRules +SuppressHTMLPreamble
@@ -192,8 +192,8 @@ NameVirtualHost *:80
Options IncludesNoExec
</Directory>
- HeaderName /_defaults/HEADER.shtml
- ReadmeName /_defaults/FOOTER.shtml
+ HeaderName /_defaults/HEADER.html
+ ReadmeName /_defaults/FOOTER.html
IndexOptions +FoldersFirst +IgnoreCase +NameWidth=* +SuppressIcon +VersionSort
IndexOptions +XHTML +SuppressRules +SuppressHTMLPreamble