Skip to content
This repository has been archived by the owner on Apr 28, 2024. It is now read-only.

Fixes bug #28 #36

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes bug #28 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions themes/bootstrap3/twig/layout.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,28 @@
<head>
<meta charset="UTF-8" />
<title>{% block title %}Welcome!{% endblock %}</title>
<link rel="stylesheet" type="text/css" href="{{ app.request.basepath }}/themes/{{ app.theme }}/css/style.css">
<link rel="stylesheet" type="text/css" href="{{ app.request.basepath }}/themes/{{ app.theme }}/css/fontawesome.css">
<link rel="stylesheet" type="text/css" href="{{ app.request.basepath }}/themes/{{ app.theme }}/css/gitgraph.css">
<link rel="shortcut icon" type="image/png" href="{{ app.request.basepath }}/themes/{{ app.theme }}/img/favicon.png" />
<link rel="stylesheet" type="text/css" href="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/css/style.css">
<link rel="stylesheet" type="text/css" href="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/css/fontawesome.css">
<link rel="stylesheet" type="text/css" href="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/css/gitgraph.css">
<link rel="shortcut icon" type="image/png" href="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/img/favicon.png" />
<!--[if lt IE 9]>
<script src="{{ app.request.basepath }}/themes/{{ app.theme }}/js/html5.js"></script>
<script src="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/js/html5.js"></script>
<![endif]-->
</head>

<body>
{% block body %}{% endblock %}
{% block javascripts %}
<script src="{{ app.request.basepath }}/themes/{{ app.theme }}/js/jquery.js"></script>
<script src="{{ app.request.basepath }}/themes/{{ app.theme }}/js/raphael.js"></script>
<script src="{{ app.request.basepath }}/themes/{{ app.theme }}/js/bootstrap.js"></script>
<script src="{{ app.request.basepath }}/themes/{{ app.theme }}/js/codemirror.js"></script>
<script src="{{ app.request.basepath }}/themes/{{ app.theme }}/js/showdown.js"></script>
<script src="{{ app.request.basepath }}/themes/{{ app.theme }}/js/table.js"></script>
<script src="{{ app.request.basepath }}/themes/{{ app.theme }}/js/main.js"></script>
<script src="{{ app.request.basepath }}/themes/{{ app.theme }}/js/networkGraph.js"></script>
<script src="{{ app.request.basepath }}/themes/{{ app.theme }}/js/gitgraph.js"></script>
<script src="{{ app.request.basepath }}/themes/{{ app.theme }}/js/draw.js"></script>
<script src="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/js/jquery.js"></script>
<script src="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/js/raphael.js"></script>
<script src="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/js/bootstrap.js"></script>
<script src="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/js/codemirror.js"></script>
<script src="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/js/showdown.js"></script>
<script src="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/js/table.js"></script>
<script src="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/js/main.js"></script>
<script src="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/js/networkGraph.js"></script>
<script src="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/js/gitgraph.js"></script>
<script src="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/js/draw.js"></script>
{% endblock %}
</body>
</html>
4 changes: 2 additions & 2 deletions themes/bootstrap3/twig/layout_page.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<div class="header row">
<div class="col-sm-12">
{% if page in ['commits', 'searchcommits'] %}
<form class="pull-right" action="{{ app.request.basepath }}/{{repo}}/commits/{{branch}}/search" method="POST">
<form class="pull-right" action="{{ app.request_stack.currentRequest.basepath }}/{{repo}}/commits/{{branch}}/search" method="POST">
<input type="search" name="query" class="form-control input-sm" placeholder="Search commits...">
</form>
{% else %}
<form class="pull-right" action="{{ app.request.basepath }}/{{repo}}/tree/{{branch}}/search" method="POST">
<form class="pull-right" action="{{ app.request_stack.currentRequest.basepath }}/{{repo}}/tree/{{branch}}/search" method="POST">
<input type="search" name="query" class="form-control input-sm" placeholder="Search tree...">
</form>
{% endif %}
Expand Down
4 changes: 2 additions & 2 deletions themes/bootstrap3/twig/tree.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
{% endif %}
</div><br />
{% if app.show_ssh_remote %}
<input type="text" class="form-control{{ app.show_ssh_remote ? ' visible' }}" id="clone-input-ssh" value="git clone {{ app.ssh_user }}@{{ app.request.host }}:{{ repo }}">
<input type="text" class="form-control{{ app.show_ssh_remote ? ' visible' }}" id="clone-input-ssh" value="git clone {{ app.ssh_user }}@{{ app.request_stack.currentRequest.host }}:{{ repo }}">
{% endif %}
{% if app.show_http_remote %}
<input type="text" class="form-control{{ app.show_ssh_remote is empty and app.show_http_remote ? ' visible' }}" id="clone-input-http" value="git clone http{{ app.use_https ? 's' }}://{{ app.http_user }}{{ app.http_user ? '@' }}{{ app.request.host }}/{{ app.url_subdir }}{{ repo }}">
<input type="text" class="form-control{{ app.show_ssh_remote is empty and app.show_http_remote ? ' visible' }}" id="clone-input-http" value="git clone http{{ app.use_https ? 's' }}://{{ app.http_user }}{{ app.http_user ? '@' }}{{ app.request_stack.currentRequest.host }}/{{ app.url_subdir }}{{ repo }}">
{% endif %}
</div>
</div>
Expand Down
30 changes: 15 additions & 15 deletions themes/default/twig/layout.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,28 @@
<head>
<meta charset="UTF-8" />
<title>{{ app.title }}{% if app.title %} - {% endif %}{% block title %}Welcome!{% endblock %}</title>
<link rel="stylesheet" type="text/css" href="{{ app.request.basepath }}/themes/{{ app.theme }}/css/style.css">
<link rel="stylesheet" type="text/css" href="{{ app.request.basepath }}/themes/{{ app.theme }}/css/gitgraph.css">
<link rel="shortcut icon" type="image/png" href="{{ app.request.basepath }}/themes/{{ app.theme }}/img/favicon.png" />
<link rel="stylesheet" type="text/css" href="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/css/style.css">
<link rel="stylesheet" type="text/css" href="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/css/gitgraph.css">
<link rel="shortcut icon" type="image/png" href="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/img/favicon.png" />
<!--[if lt IE 9]>
<script src="{{ app.request.basepath }}/themes/{{ app.theme }}/js/html5.js"></script>
<script src="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/js/html5.js"></script>
<![endif]-->
</head>

<body>
{% block body %}{% endblock %}
{% block javascripts %}
<script src="{{ app.request.basepath }}/themes/{{ app.theme }}/js/jquery.js"></script>
<script src="{{ app.request.basepath }}/themes/{{ app.theme }}/js/raphael.js"></script>
<script src="{{ app.request.basepath }}/themes/{{ app.theme }}/js/bootstrap.js"></script>
<script src="{{ app.request.basepath }}/themes/{{ app.theme }}/js/codemirror.js"></script>
<script src="{{ app.request.basepath }}/themes/{{ app.theme }}/js/showdown.js"></script>
<script src="{{ app.request.basepath }}/themes/{{ app.theme }}/js/table.js"></script>
<script src="{{ app.request.basepath }}/themes/{{ app.theme }}/js/list.min.js"></script>
<script src="{{ app.request.basepath }}/themes/{{ app.theme }}/js/main.js"></script>
<script src="{{ app.request.basepath }}/themes/{{ app.theme }}/js/networkGraph.js"></script>
<script src="{{ app.request.basepath }}/themes/{{ app.theme }}/js/gitgraph.js"></script>
<script src="{{ app.request.basepath }}/themes/{{ app.theme }}/js/draw.js"></script>
<script src="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/js/jquery.js"></script>
<script src="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/js/raphael.js"></script>
<script src="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/js/bootstrap.js"></script>
<script src="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/js/codemirror.js"></script>
<script src="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/js/showdown.js"></script>
<script src="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/js/table.js"></script>
<script src="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/js/list.min.js"></script>
<script src="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/js/main.js"></script>
<script src="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/js/networkGraph.js"></script>
<script src="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/js/gitgraph.js"></script>
<script src="{{ app.request_stack.currentRequest.basepath }}/themes/{{ app.theme }}/js/draw.js"></script>
{% endblock %}
</body>
</html>
4 changes: 2 additions & 2 deletions themes/default/twig/layout_page.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<div class="row">
<div class="span12">
{% if page in ['commits', 'searchcommits'] %}
<form class="form-search pull-right" action="{{ app.request.basepath }}/{{repo}}/commits/{{branch}}/search" method="POST">
<form class="form-search pull-right" action="{{ app.request_stack.currentRequest.basepath }}/{{repo}}/commits/{{branch}}/search" method="POST">
<input type="text" name="query" class="input-medium search-query" placeholder="Search commits..." value="{{ query | default("") }}">
</form>
{% else %}
<form class="form-search pull-right" action="{{ app.request.basepath }}/{{repo}}/tree/{{branch}}/search" method="POST">
<form class="form-search pull-right" action="{{ app.request_stack.currentRequest.basepath }}/{{repo}}/tree/{{branch}}/search" method="POST">
<input type="text" name="query" class="input-medium search-query" placeholder="Search tree..." value="{{ query | default("") }}">
</form>
{% endif %}
Expand Down
4 changes: 2 additions & 2 deletions themes/default/twig/tree.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
{% endif %}
</div><br />
{% if app.show_ssh_remote %}
<input type="text" class="form-control{{ app.show_ssh_remote ? ' visible' }}" id="clone-input-ssh" value="git clone {{ app.ssh_user }}@{{ app.request.host }}:{{ repo }}">
<input type="text" class="form-control{{ app.show_ssh_remote ? ' visible' }}" id="clone-input-ssh" value="git clone {{ app.ssh_user }}@{{ app.request_stack.currentRequest.host }}:{{ repo }}">
{% endif %}
{% if app.show_http_remote %}
<input type="text" class="form-control{{ app.show_ssh_remote is empty and app.show_http_remote ? ' visible' }}" id="clone-input-http" value="git clone http{{ app.use_https ? 's' }}://{{ app.http_user }}{{ app.http_user ? '@' }}{{ app.request.host }}/{{ app.url_subdir }}{{ repo }}">
<input type="text" class="form-control{{ app.show_ssh_remote is empty and app.show_http_remote ? ' visible' }}" id="clone-input-http" value="git clone http{{ app.use_https ? 's' }}://{{ app.http_user }}{{ app.http_user ? '@' }}{{ app.request_stack.currentRequest.host }}/{{ app.url_subdir }}{{ repo }}">
{% endif %}
</div>
</div>
Expand Down