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

Bootstrap theme #189

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions lib/Coocook/Controller/PurchaseList.pm
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,17 @@ sub edit : GET HEAD Chained('base') PathPart('') Args(0) RequiresCapability('vie
$ingredient->{remove_url} =
$c->project_uri( '/purchase_list/remove_ingredient', $ingredient->{id} );
}

# TODO move business logic out of controller
# 4 <- 5 -> 6
# 5 <- 5.1 -> 6
# 5 <- 5.9 -> 6
# 5 <- 6 -> 7
my $value = $item->{value} + $item->{offset};
$item->{next_higher_value} = int($value) + 1;

$value == int($value) and $value--;
$item->{next_lower_value} = int($value);
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion lib/Coocook/Controller/Recipe.pm
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ sub edit : GET HEAD Chained('base') PathPart('') Args(0) RequiresCapability('vie
);

$recipe->project->is_public
and $c->stash( public_url => $c->uri_for_action( '/browse/recipe/show', [ $recipe->id, $recipe->url_name ] ) );
and $c->stash(
public_url => $c->uri_for_action( '/browse/recipe/show', [ $recipe->id, $recipe->url_name ] ) );

for my $ingredient ( @{ $c->stash->{ingredients} } ) {
$ingredient->{reposition_url} = $c->project_uri( '/recipe/reposition', $ingredient->{id} );
Expand Down
5 changes: 2 additions & 3 deletions lib/Coocook/Controller/Root.pm
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,12 @@ sub auto : Private {

$c->stash(
css => [
'/lib/bootstrap-5.1.3-dist/css/bootstrap' . ( $c->debug ? '.css' : '.min.css' ),
'/css/local_bootstrap_modifications.css',
'/lib/themed-bootstrap/themed' . ( $c->debug ? '.css' : '.min.css' ),
'/css/material-design-icons.css',
'/css/style.css',
],
js => [
'/lib/bootstrap-5.1.3-dist/js/bootstrap' . ( $c->debug ? '.js' : '.min.js' ),
'/lib/bootstrap/dist/js/bootstrap.bundle' . ( $c->debug ? '.js' : '.min.js' ),
'/lib/marked/marked.min.js',
'/js/script.js',
],
Expand Down
144 changes: 0 additions & 144 deletions root/static/css/local_bootstrap_modifications.css

This file was deleted.

Loading