Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Benefit from the hashsum calculation for our icons too #789

Merged
merged 3 commits into from
Jul 18, 2016
Merged

Benefit from the hashsum calculation for our icons too #789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49fc9b8
Benefit from the hashsum calculation for our icons too
coolo Jul 18, 2016
6740d5e
Remove pauseplay class and image - no longer used
coolo Jul 18, 2016
e5e6228
Add more icons to assets and remove what's left in public/images
coolo Jul 18, 2016
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
8 changes: 5 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,10 @@ coverage-html: cover_db/coverage.html
coverage-check: cover_db/coverage.html
./script/check_coverage ${COVERAGE_THRESHOLD}

public/favicon.ico: public/images/logo.svg
public/favicon.ico: assets/images/logo.svg
for w in 16 32 64 128; do \
inkscape -e public/images/logo-$$w.png -w $$w public/images/logo.svg ; \
inkscape -e assets/images/logo-$$w.png -w $$w assets/images/logo.svg ; \
done
convert public/images/logo-16.png public/images/logo-32.png public/images/logo-64.png public/images/logo-128.png -background white -alpha remove public/favicon.ico
convert assets/images/logo-16.png assets/images/logo-32.png assets/images/logo-64.png assets/images/logo-128.png -background white -alpha remove public/favicon.ico
rm assets/images/logo-128.png assets/images/logo-32.png assets/images/logo-64.png

16 changes: 16 additions & 0 deletions assets/assetpack.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,19 @@
< javascripts/test_result.js
< javascripts/needlediff.js
< javascripts/running.js

! logo-16.png
< images/logo-16.png

! logo.svg
< images/logo.svg

! terminal.svg
< images/terminal.svg

! suse.png
< images/suse.png

! audio.svg
< images/audio.svg

0 public/images/audio.svg → assets/images/audio.svg
View file
Open in desktop
File renamed without changes
0 public/images/logo-16.png → assets/images/logo-16.png
View file
Open in desktop
File renamed without changes
0 public/images/logo.svg → assets/images/logo.svg
View file
Open in desktop
File renamed without changes
0 public/images/suse.png → assets/images/suse.png
View file
Open in desktop
File renamed without changes
0 public/images/terminal.svg → assets/images/terminal.svg
View file
Open in desktop
File renamed without changes
13 changes: 0 additions & 13 deletions assets/stylesheets/openqa.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,19 +191,6 @@ ul.modcategory {
text-decoration: none;
}

a.pauseplay {
background: url("../images/pauseplay.png") 0 0 no-repeat;
width: 23px;
height: 23px;
display: inline-block;
&.pause {
background-position: 0 0;
}
&.play {
background-position: -23px 0;
}
}

/* special table stuff */

.infotbl {
Expand Down
7 changes: 7 additions & 0 deletions lib/OpenQA/WebAPI/Plugin/Helpers.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,13 @@ sub register {

$app->helper(step_thumbnail => \&_step_thumbnail);

$app->helper(
icon_url => sub {
my ($c, $icon) = @_;
my $json = $c->app->asset->processed($icon)->[0]->TO_JSON;
return $c->url_for(assetpack => $json);
});

$app->helper(
# emit_event helper, adds user, connection to events
emit_event => sub {
Expand Down
1 change: 0 additions & 1 deletion public/asset/images
View file
Open in desktop

This file was deleted.

Binary file removed public/images/edit.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/header-logo.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/home_grey.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/interactive.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/pauseplay.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/play.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/text.png
View file
Open in desktop
Binary file not shown.
11 changes: 0 additions & 11 deletions public/index.html
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion templates/branding/openSUSE/sponsorbox.html.ep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="text-right" id="sponsorbox">
<a href="http://www.suse.com" title="SUSE">
<img alt="sponsor_suse" class="icons-sponsor_suse" src="images/suse.png" />
<img alt="sponsor_suse" class="icons-sponsor_suse" src="<%= icon_url 'suse.png' %>" />
</a>
</div>
<div class="text-muted text-center">Sponsor</div>
6 changes: 3 additions & 3 deletions templates/layouts/bootstrap.html.ep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@

<link rel="icon"
type="image/png" sizes="16x16"
href="/images/logo-16.png" />
<link rel="icon" href="/images/logo.svg" sizes="any" type="image/svg+xml">
href="<%= icon_url 'logo-16.png' %>">
<link rel="icon" href="<%= icon_url 'logo.svg'%>" sizes="any" type="image/svg+xml">

</head>
<body>
Expand All @@ -50,7 +50,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/"><img src="/images/logo.svg" alt="openQA"></a>
<a class="navbar-brand" href="/"><img src="<%= icon_url 'logo.svg'%>" alt="openQA"></a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="navbar-collapse-1">
Expand Down
4 changes: 2 additions & 2 deletions templates/test/details.html.ep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@
% if ($step->{screenshot}) {
%= step_thumbnail($step, 60, $testid, $module->{name}, $step->{num})
% } elsif ($step->{audio}) {
<img src="/images/audio.svg" width="60" height="45" alt="<%= $step->{name} %>" class="resborder <%= "resborder_\L$step->{result}" %>"/>
<img src="<%= icon_url 'audio.svg' %>" width="60" height="45" alt="<%= $step->{name} %>" class="resborder <%= "resborder_\L$step->{result}" %>"/>
% } elsif ($step->{text}) {
% if($step->{title} eq "wait_serial") {
<img src="/images/terminal.svg" width="60" height="45" alt="<%= $step->{name} %>" class="resborder <%= "resborder_\L$step->{result}" %>"/>
<img src="<%= icon_url 'terminal.svg' %>" width="60" height="45" alt="<%= $step->{name} %>" class="resborder <%= "resborder_\L$step->{result}" %>"/>
% } else {
<span class="resborder <%= "resborder_\L$step->{result}" %>" ><%= $step->{title} || 'Text' %></span>
% }
Expand Down