Skip to content
This repository was archived by the owner on Jun 21, 2022. It is now read-only.

Style import buttons #178

Closed
wants to merge 2 commits into from
Closed

Style import buttons #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c68252
Style import btn on public recipe page
kuro610 May 31, 2022
5afee82
Add shortlink to used section closes #131
kuro610 May 31, 2022
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
2 changes: 1 addition & 1 deletion root/static/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ main a[href]:active {
color: #333333;
}

a.btn-secondary {
a.btn-secondary, a.btn-primary {
color: #fff !important;
}

Expand Down
26 changes: 15 additions & 11 deletions root/templates/browse/recipe/show.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
[% escape_title( 'Recipe', recipe.name ) %]

[% IF project_url %]
<p>
from project <a href="[% project_url %]">[% recipe.project.name | html %]</a>
[% IF import_url %]
<form method="get" action="[% import_url %]" class="inline">
<input type="submit" value="Import" title="Import this recipe into one of your projects">
</form>
<div class="row my-3">
<div class="col">
[% IF project_url %]
<p class="m-0">from project <a href="[% project_url %]">[% recipe.project.name | html %]</a></p>
[% IF import_url %]
<form method="get" action="[% import_url %]">
<button class="btn btn-secondary my-2" type="submit" title="Import this recipe into one of your projects">
<i class="material-icons ">import_export</i> Import into another project
</button>
</form>
[% END %]
[% ELSE %]
<p>from a private project</p>
[% END %]
</p>
[% ELSE %]
<p>from a private project</p>
[% END %]
</div>
</div>

<form method="get" action="">
Servings:
Expand Down
7 changes: 5 additions & 2 deletions root/templates/recipe/edit.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@

<div class="row mb-5">
<div class="col">
<a class="btn btn-primary[% IF dishes.size == 0 %] disabled[% END %]" href="#used">
Used in <span class="badge bg-light text-dark">[% dishes.size %]</span> dish[% IF dishes.size != 1 %]es[% END %]
</a>
[% IF import_url %]
<form method="get" action="[% import_url %]" class="inline">
<form method="get" action="[% import_url %]" class="d-inline">
<button type="submit" class="btn btn-secondary" data-toggle="tooltip" title="Import this recipe into another one of your projects">
<i class="material-icons ">import_export</i> Import into another project
</button>
Expand Down Expand Up @@ -82,7 +85,7 @@

[% INCLUDE 'includes/forms/ingredients_add.tt' %]

<h2>Where <em>[% recipe.name | html %]</em> is used</h2>
<h2 id="used">Where <em>[% recipe.name | html %]</em> is used</h2>

<ul>
[% FOR dish IN dishes %]
Expand Down
2 changes: 1 addition & 1 deletion root/templates/wrapper.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ END %]

<main>
<div class="container-fluid pb-2"><!-- main container-fluid -->
<div class="row py-3">
<div class="row my-3">

<div class="col-12">
<h1 id="print_h1" style="display: none">[% name | html; IF project %]: [% project.name | html; END %]</h1>
Expand Down