Skip to content

Commit

Permalink
Update demo application
Browse files Browse the repository at this point in the history
Update Foundation: 4 -> 5
Update composer version
Update markup
  • Loading branch information
Vladislav Bakin committed Dec 30, 2013
1 parent 6a11ed7 commit 4e4333c
Show file tree
Hide file tree
Showing 6 changed files with 955 additions and 1,924 deletions.
18 changes: 7 additions & 11 deletions application/components/blog/view/index.twig
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,13 @@
});"|format(translate('Do you want to delete post?'))) %}
{% endif %}
<div class="row">
<div class="large-12 columns">
<h2>{{ translate('Blog') }}</h2>

{% if (getCurrentUser()) %}
<div class="large-3 column text-right">
<a class="button" href="{{ url('addPost') }}">{{ translate('Add post') }}</a>
</div>
{% endif %}

<hr/>
</div>
<h2 class="large-9 columns">{{ translate('Blog') }}</h2>
{% if (getCurrentUser()) %}
<div class="large-3 column text-right">
<a class="button" href="{{ url('addPost') }}">{{ translate('Add post') }}</a>
</div>
{% endif %}
<hr/>
</div>
{% for post in paginator.getPageItems() %}
<div class="post row" id="post_{{ post.id }}">
Expand Down
2 changes: 1 addition & 1 deletion application/view/layout.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<section class="top-bar-section">
<ul class="right">
<li class="divider"></li>
<li class="active">
<li>
<a href="<?= $this->url('home', [], true) ?>">
<?= $this->translate("Home") ?>
</a>
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
}
},
"require": {
"umi/framework": "~1.0.0@RC"
"umi/framework": "1.*@RC"
}
}
2 changes: 1 addition & 1 deletion public_html/css/foundation.min.css

Large diffs are not rendered by default.

11 changes: 3 additions & 8 deletions public_html/js/foundation.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit 4e4333c

Please sign in to comment.