From 0db4c7229a7fdc3f1f98ac3c6b9af13f50b1591c Mon Sep 17 00:00:00 2001 From: Ryan Lerch Date: Dec 24 2015 09:22:01 +0000 Subject: more changes to the templates --- diff --git a/pagure/static/koji.css b/pagure/static/koji.css index c4b4370..ad592f6 100644 --- a/pagure/static/koji.css +++ b/pagure/static/koji.css @@ -1,459 +1,12 @@ -/* - Koji styling - Copyright (c) 2007,2008, 2009, 2012 Red Hat, Inc. - - Authors: - Mike Bonnet - Mike McLean - Dennis Gilmore -*/ - -body { - margin: 0px; - padding: 0px; - font-size: small; - font-family: Cantarell, sans-serif; - color: #666!important; - background: #fff url(header-bg.png) repeat-x; -} - -a, a:visited, a:hover { - color: #0066CC; - text-decoration: none; -} - -h4 -{ - font-size:19px; - margin-bottom:14px; -} - -#wrap { - max-width:1100px; - margin-left:auto; - margin-right:auto; - padding: 0; - text-align: left; -} - -#innerwrap { -position:relative; -} - -#header { -height:87px -} - -#headerSearch { - display:inline-block; - position:relative; - float:right; - top: 40px; -} - -#headerSearch input, -#headerSearch select { - font-size: 16px; -} - -#headerSearch input[type="submit"], #pending input[type="submit"], -.acls input[type="submit"], #options input[type="submit"] -{ - background-color: white; - box-shadow: 0 6px 10px rgba(0, 0, 0, 0.15) inset; - border-radius: 10px 10px 10px 10px; - color: #3D69A8; - cursor:pointer; -} - -#headerSearch input[type="text"] -{ - border: 1px solid white; - box-shadow: 0 6px 10px rgba(0, 0, 0, 0.15) inset; - -webkit-box-shadow: 0 6px 10px rgba(0, 0, 0, 0.15) inset; - -moz-box-shadow: 0 6px 10px rgba(0, 0, 0, 0.15) inset; - padding: 3px; -} - -#kojiLogo { - /* Used only for the koji logo icon */ - display:inline-block; - padding-top:8px; - margin-left: .5em; -} - -#PoweredByKojiLogo { - /* Used only for the koji logo icon */ - float: right; - border: 0px; - height: 20px; -} - - -div#content { - margin-top: 2em; - clear: both; -} - -p#footer { - padding-top: 1em; - margin-left: 15px; - line-height: 1.5em; - color: #999; - font-size: xx-small; - clear: both; -} - -p#footer a { - text-decoration: none; -} - -.hide { - display: none; -} - -.disabled { - color: #808080; -} - -#mainNav { - font-size:16px; - font-weight:bold; - height: 30px; -} - -#mainNav ul { - padding: 0px; - margin: 0px; - list-style-type: none; -} - -#mainNav ul li { - - float: left; - -} - -#mainNav ul li a { - display: block; - color: rgba(255,255,255,0.8); - text-decoration: none; - padding: 0.5em 1.5em; - font-size: 0.77em; - height: 1.5em; -} - -#mainNav ul li:hover { - -webkit-border-top-left-radius: 5px; - -webkit-border-top-right-radius: 5px; - -moz-border-radius-topleft: 5px; - -moz-border-radius-topright: 5px; - border-top-left-radius: 5px; - border-top-right-radius: 5px; - background-color:rgba(255,255,255,0.1); -} - -body#home #mainNav li#homeTab a, -body#users #mainNav li#usersTab a, -body#new_project #mainNav li#new_project a, -body#groups #mainNav li#groupsTab a, -body#admin #mainNav li#adminTab a { - background-color: #fff; - color: #444; - -webkit-border-top-left-radius: 5px; - -webkit-border-top-right-radius: 5px; - -moz-border-radius-topleft: 5px; - -moz-border-radius-topright: 5px; - border-top-left-radius: 5px; - border-top-right-radius: 5px; -} - - -img.sort { - /* used for up/down sort arrows*/ - vertical-align: baseline; - width: 10px; - height: 9px; -} - -td.paginate { - text-align: center; -} - -form.pageJump { - float: right; - margin-left: 20px; -} - -form.pageJump select { - font-size: smaller; -} - -div.dataHeader { - font-weight: bold; - font-size:17px; - line-height:28px; - padding-bottom:4px; -} - -div.pageHeader { - margin-bottom: 10px; - font-weight: bold; - font-size: 19px; -} - -table.nested { - float: left; -} - -td.container { - /*padding: 4px 0px;*/ - width: 100%; -} - -table.nested th, -table.nested td { - padding: 2px 4px; -} - -div.toggle { - padding: 6px; -} - -td.tree { - -} - -.tree span.root { - font-weight: bold; - -} - -.tree ul { - padding-left: 2em; - list-style: none; - margin-top: 0em; - margin-bottom: 0em; -} - -.tree span.treeBranch { - border-bottom: 1px solid #000; - border-left: 1px solid #000; - font-size: 1.2em; -} - -.tree li.sibling > span.treeBranch { - border-left-width: 0em; -} - -.tree li.sibling { - border-left: 1px solid #000; -} - -.tree a { - text-decoration: none; -} - -.tree span.treeLabel { - position: relative; - top: 0.6em; - margin-left: 1.2em; - padding-left: 0.2em; - - font-size: 0.83em; -} - -.tree > ul { - padding-bottom: 0.6em; -} - -.hidden { - display: none; -} - -.tree span.treeToggle { - font-weight: bold; -} - -.tree span.treeLink { - font-size: smaller; -} - -.adminLink { - color: #000; -} - -img.stateimg { - margin-top: -6px; - margin-bottom: -6px; -} - -.charlist { - text-align: center; -} - -img.graphrow { - background-color: #00f; - vertical-align: bottom; -} - -table.data-list { - width: 100%; -} - -table.data-list td { - vertical-align: text-top; - padding-left:3px; -} - -tr.list-header { - background-color: #fff; -} - -tr.list-header th { - background-color: #eee; - box-shadow: 0 -1px 0 #ddd, 0 1px 0 #ddd; - text-align:left; - padding-left:4px; -} - -tr.list-header th { -min-width:1px; -} - -table.nested th -{ - min-width:1px; -} - -tr.row-even, -tr.row-odd -{ - box-shadow: 0 1px 0 #ddd; -} - -tr.row-even td, -tr.row-odd td +.nav-tabs { -padding-left:4px; + border-bottom:none; } -tr.row-odd td:first-child, -tr.row-even td:first-child - { - box-shadow: -1px 0 0 #ddd; -} - -tr.row-odd td:last-child, -tr.row-even td:last-child { - box-shadow: 1px 0 0 #ddd; -} - -tr.list-header th:first-child +.repo-header { - box-shadow: -1px 0 0 #ddd,0 -1px 0 #ddd, 0 1px 0 #ddd; -} - -tr.list-header th:last-child -{ - box-shadow: 1px 0 0 #ddd,0 -1px 0 #ddd, 0 1px 0 #ddd; -} - -tr.row-even td.tree { - -} - -tr.row-even td.tree span.treeLabel { - -} - -.taskfree, .taskfree:visited, .taskfree:hover { - color: #3300CC; - background-color:#fff; -} -.taskopen, .taskopen:visited, .taskopen:hover { - color: #FF6600; - background-color:#fff; -} -.taskclosed, .taskclosed:visited, .taskclosed:hover { - color: #00CC00; - background-color:#fff; -} -.taskcanceled, .taskcanceled:visited, .taskcanceled:hover { - color: #CC9900; - background-color:#fff; -} -.taskassigned, .taskassigned:visited, .taskassigned:hover { - color: #CC00FF; - background-color:#fff; -} -.taskfailed, .taskfailed:visited, .taskfailed:hover { - color: #CC0000; - background-color:#fff; -} - -a.help { - text-decoration: underline; -} - -abbr { - cursor: help; -} - -.changelog { - font-family: monospace; - font-size: medium; - white-space: pre; -} - -#headerHelp { - float: right; - margin: 15px 10px 0 0; -} - -.filterlist { - font-size: smaller; -} - -span#loginInfo { - background-color: #ccc; - font-weight: bold; - padding: 3px 15px; - position: absolute; - right: 0; - top: 0; - -webkit-border-bottom-left-radius: 3px; - -webkit-border-bottom-right-radius: 3px; - -moz-border-radius-bottomleft: 3px; - -moz-border-radius-bottomright: 3px; - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; - box-shadow: 0 10px 10px rgba(255, 255, 255, 0.5) inset, 0 1px 3px rgba(0, 0, 0, 0.5); - -mox-box-shadow: 0 10px 10px rgba(255, 255, 255, 0.5) inset, 0 1px 3px rgba(0, 0, 0, 0.5); - -webkit-box-shadow: 0 10px 10px rgba(255, 255, 255, 0.5) inset, 0 1px 3px rgba(0, 0, 0, 0.5); -} - -.smaller { - font-size: smaller; -} - -.rpmheader { - /*font-family: monospace; - font-size: medium; - white-space: pre;*/ -} - -.error { - color: red; -} - -a.headerlink { - color: #666; - visibility: hidden; -} - -header:hover > a.headerlink { - visibility: visible; + background:#f3f3f3; + border-bottom:1px solid #DDD; } .highlighted-line { diff --git a/pagure/templates/file.html b/pagure/templates/file.html index f0d5e62..00fa00b 100644 --- a/pagure/templates/file.html +++ b/pagure/templates/file.html @@ -62,21 +62,35 @@ {% endif %} {% else %} -
-

Tree

- -
+
+
+ Current Tree +
+
+ + + {% for entry in content %} + + + + + {% endfor %} + +
+ {% if entry.filemode == 16384 %} + + {% else %} + + {% endif %} + + {% if entry.filemode == 16384 %}{% endif%} + {{ entry.name }} + {% if entry.filemode == 16384 %}{% endif%} + + {{ entry.hex|short }} +
+
+
{% endif %} {% else %} No content found in this repository diff --git a/pagure/templates/master.html b/pagure/templates/master.html index 733fb0e..42c6cb9 100644 --- a/pagure/templates/master.html +++ b/pagure/templates/master.html @@ -5,7 +5,8 @@ {% block title %}{% endblock %} - Pagure - + + @@ -76,16 +77,8 @@ -
-
- - - - -
- - {% with messages = get_flashed_messages(with_categories=true) %} +
+ {% block content %}{% endblock %} - -
-
@@ -125,7 +115,7 @@ filename='sorttable.js') }}"> {% endblock %} diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html index 81c2c0c..ed32b71 100644 --- a/pagure/templates/repo_info.html +++ b/pagure/templates/repo_info.html @@ -9,33 +9,77 @@ {% endblock %} {% block repo %} +
+
+ {% if readme %} +
+ {% if safe %} + {{ readme | noJS |safe }} + {% else %} + {{ readme | noJS }} + {% endif %} +
+ {% endif %} +
+
+
+
+ Admins +
+
+ +
+
-
-

Admins

- -
+
+
+ +
+
+ {% if repo_obj and repo_obj.is_empty %} @@ -113,24 +157,7 @@ {% endif %} - {% if tree %} -
-

Current tree

- -
- {% endif %} - -
+
diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html index 1e25652..a2ffc43 100644 --- a/pagure/templates/repo_master.html +++ b/pagure/templates/repo_master.html @@ -5,34 +5,51 @@ {% block content %} -
-

- - {{ repo.fullname }} - - {% if branchname %} ({{ branchname }}) {% endif %} -

- - {% if repo.description %}{{ repo.description | markdown |safe }}{% else %}-{% endif -%} - {%- if repo.url %} | {{ repo.url }}{% endif %} - +
+
+
+

+ + {{ repo.fullname }} + + {% if branchname %} +
+ + +
+ {% for branch in branches %} + + {{ branch }} + + {% endfor %} +
+
+ {% endif %} - {% if repo.is_fork %} - - {% endif %} +

+ + {% if repo.description %}{{ repo.description | markdown |safe }}{% else %}-{% endif -%} + {%- if repo.url %} | {{ repo.url }}{% endif %} + -
+ {% if repo.is_fork %} + + {% endif %} -
    +
+
  • Overview @@ -102,7 +119,10 @@ {% endif %} {% endif %}
+ + +
{% block repo %} {% endblock %} - +
{% endblock %} diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index 1c5a9e7..c70a83c 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -216,6 +216,21 @@ def view_repo_branch(repo, branchname, username=None): break diff_commits.append(commit.oid.hex) + readme = None + safe=False + tree=sorted(last_commits[0].tree, key=lambda x: x.filemode) + for i in tree: + name, ext = os.path.splitext(i.name) + if name == 'README': + content = __get_file_in_tree( + repo_obj, last_commits[0].tree, [i.name]).data + + readme, safe = pagure.doc_utils.convert_readme( + content, ext, + view_file_url=flask.url_for( + 'view_raw_file', username=username, + repo=repo.name, identifier=branchname, filename='')) + return flask.render_template( 'repo_info.html', select='overview', @@ -225,7 +240,9 @@ def view_repo_branch(repo, branchname, username=None): branches=sorted(repo_obj.listall_branches()), branchname=branchname, last_commits=last_commits, - tree=sorted(last_commits[0].tree, key=lambda x: x.filemode), + tree=tree, + safe=safe, + readme=readme, diff_commits=diff_commits, repo_admin=is_repo_admin(repo), form=pagure.forms.ConfirmationForm(), diff --git a/runserver.py b/runserver.py index 2e5164a..2d8bd56 100755 --- a/runserver.py +++ b/runserver.py @@ -39,4 +39,4 @@ if args.config: os.environ['PAGURE_CONFIG'] = args.config APP.debug = True -APP.run(port=int(args.port)) +APP.run(host='0.0.0.0', port=int(args.port))