ma27/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Add fontawesome as required by newer bootstrap

Browse source
This commit is contained in:
Tyson Whitehead 2019-08-28 15:38:17 -04:00
parent cd0ff484f7
commit eb8a0f279a
No known key found for this signature in database
GPG key ID: B22199763A27997B
9 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/root/Makefile.am
View file

@ -10,8 +10,9 @@ STATIC = \
FLOT = flot-0.8.3.zip
BOOTSTRAP = bootstrap-4.3.1-dist.zip
FONTAWESOME = fontawesome-free-5.10.2-web.zip
ZIPS = $(FLOT) $(BOOTSTRAP)
ZIPS = $(FLOT) $(BOOTSTRAP) $(FONTAWESOME)
EXTRA_DIST = $(TEMPLATES) $(STATIC) $(ZIPS)
@ -22,9 +23,14 @@ all:
mkdir -p $(srcdir)/static/js
unzip -u -d $(srcdir)/static $(BOOTSTRAP)
unzip -u -d $(srcdir)/static/js $(FLOT)
unzip -u -d $(srcdir)/static $(FONTAWESOME)
install-data-local: $(ZIPS)
mkdir -p $(hydradir)/static/js
cp -prvd $(srcdir)/static/js/* $(hydradir)/static/js
mkdir -p $(hydradir)/static/bootstrap
cp -prvd $(srcdir)/static/$(basename $(BOOTSTRAP))/* $(hydradir)/static/bootstrap
mkdir -p $(hydradir)/static/fontawesome/css
cp -prvd $(srcdir)/static/$(basename $(FONTAWESOME))/css/all.css $(hydradir)/static/fontawesome/css
mkdir -p $(hydradir)/static/fontawesome/webfonts
cp -prvd $(srcdir)/static/$(basename $(FONTAWESOME))/webfonts/* $(hydradir)/static/fontawesome/webfonts

6
src/root/edit-jobset.tt
View file

@ -9,7 +9,7 @@
[% BLOCK renderJobsetInput %]
<tr class="input [% extraClass %]" [% IF id %]id="[% id %]"[% END %]>
<td>
<button type="button" class="btn btn-warning" onclick='$(this).parents(".input").remove()'><i class="icon-trash icon-white"></i></button>
<button type="button" class="btn btn-warning" onclick='$(this).parents(".input").remove()'><i class="fas fa-trash"></i></button>
</td>
<td>
<input type="text" id="[% baseName %]-name" name="[% baseName %]-name" [% HTML.attributes(value => input.name) %]/>
@ -51,7 +51,7 @@
[% INCLUDE renderJobsetInput input=input baseName="input-$input.name" %]
[% END %]
<tr>
<td colspan="4" style="text-align: center;"><button type="button" class="add-input btn btn-success"><i class="icon-plus icon-white"></i> Add a new input</button></td>
<td colspan="4" style="text-align: center;"><button type="button" class="add-input btn btn-success"><i class="fas fa-plus"></i> Add a new input</button></td>
</tr>
</tbody>
</table>
@ -182,7 +182,7 @@
[% INCLUDE renderJobsetInputs %]
<button id="submit-jobset" type="submit" class="btn btn-primary"><i class="icon-ok icon-white"></i> [%IF !edit %]Create jobset[% ELSE %]Apply changes[% END %]</button>
<button id="submit-jobset" type="submit" class="btn btn-primary"><i class="fas fa-check"></i> [%IF !edit %]Create jobset[% ELSE %]Apply changes[% END %]</button>
<table style="display: none">
[% INCLUDE renderJobsetInput input="" extraClass="template" id="input-template" baseName="input-template" %]

2
src/root/edit-project.tt
View file

@ -71,7 +71,7 @@
</div>
<button id="submit-project" type="submit" class="btn btn-primary">
<i class="icon-ok icon-white"></i>
<i class="fas fa-check"></i>
[%IF create %]Create project[% ELSE %]Apply changes[% END %]
</button>

BIN
src/root/fontawesome-free-5.10.2-web.zip Normal file
View file

Binary file not shown.

2
src/root/jobset-eval.tt
View file

@ -2,7 +2,7 @@
[% PROCESS common.tt %]
<div class="btn-group pull-right">
<a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#"><i class="icon-white icon-eye-open"></i> Compare to...</a>
<a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#"><i class="fas fa-eye"></i> Compare to...</a>
<ul class="dropdown-menu">
<li><a href="?">Preceding evaluation in this jobset</a></li>
<li class="divider"></li>

1
src/root/layout.tt
View file

@ -17,6 +17,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link href="[% c.uri_for("/static/fontawesome/css/all.css") %]" rel="stylesheet" />
<script type="text/javascript" src="[% c.uri_for("/static/js/popper.min.js") %]"></script>
<script type="text/javascript" src="[% c.uri_for("/static/bootstrap/js/bootstrap.min.js") %]"></script>
<link href="[% c.uri_for("/static/bootstrap/css/bootstrap.min.css") %]" rel="stylesheet" />

2
src/root/news.tt
View file

@ -30,7 +30,7 @@
</div>
<button type="submit" class="btn btn-primary">
<i class="icon-ok icon-white"></i>
<i class="fas fa-check"></i>
Post
</button>
</form>

6
src/root/user.tt
View file

@ -100,18 +100,18 @@
[% END %]
<button id="submit-user" class="btn btn-primary">
<i class="icon-ok icon-white"></i>
<i class="fas fa-check"></i>
[%IF create %]Create[% ELSE %]Apply changes[% END %]
</button>
[% IF !create && c.check_user_roles('admin') && user.type == 'hydra' %]
<button id="reset-password" class="btn btn-warning">
<i class="icon-trash icon-white"></i>
<i class="fas fa-lock"></i>
Reset password
</button>
[% END %]
[% IF !create %]
<button id="delete-user" class="btn btn-danger">
<i class="icon-trash icon-white"></i>
<i class="fas fa-trash"></i>
Delete this user
</button>
[% END %]

2
src/root/users.tt
View file

@ -25,7 +25,7 @@
</table>
<a class="btn btn-primary" href="[% c.uri_for(c.controller('Root').action_for('register')) %]">
<i class="icon-plus"></i> Add a new user
<i class="fas fa-plus"></i> Add a new user
</a>
[% END %]