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

Changes to home view #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Changes to home view #3

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
be1cf0a
No hotlinking
vuxor Oct 5, 2016
1227f13
Resolve conflicts from #ad331f6
vuxor Oct 5, 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
Binary file added img/loading_spinner.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
51 changes: 7 additions & 44 deletions views/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<div class="row">
<div class="loading col-lg-8 col-lg-offset-2" ng-if="!radionice && !ovaRadionica">
<img src="http://www.arabianbusiness.com/skins/ab.main/gfx/loading_spinner.gif" />
<img src="/img/loading_spinner.gif" />
</div>
</div>

Expand Down Expand Up @@ -34,28 +34,6 @@ <h2 class="workshop-title">{{ovaRadionica.ime}}</h2>
<a href="#/add" class="btn btn-primary"> Dodaj radionicu </a>
</div>
</div>
<<<<<<< HEAD
</div>

<div class="row">
<h1 class="work-title"> DOGAĐAJI </h1>
<div class="col-lg-6 workshop col-md-6 workshop" ng-if="events" ng-repeat="event in events">
<div class="workshop-inner">
<h3 class="workshop-title"><a href="#/{{event.id}}">{{event.ime}}</a></h3>
<img class="col-md-12 workshop-image img-responsive" src="{{event.img}}"/>
<p class="workshop-text text-info">{{event.mesto}}</p>
||||||| merged common ancestors
</div>

<div class="row">
<h1 class="work-title"> DOGAĐAJI </h1>
<div class="col-lg-6 workshop col-md-6 workshop" ng-if="events" ng-repeat="event in events">
<div class="workshop-inner">
<h3 class="workshop-title"><a href="#/{{event.id}}">{{event.ime}}</a></h3>
<img class="col-md-12 workshop-image img-responsive" src="{{event.img}}"/>
<p class="workshop-text text-info">{{event.mesto}}</p>
=======


<div class="row">
<h1 class="work-title"> DOGAĐAJI </h1>
Expand All @@ -65,30 +43,15 @@ <h3 class="workshop-title"><a href="#/{{event.id}}">{{event.ime}}</a></h3>
<img class="col-md-12 workshop-image img-responsive" src="{{event.img}}" />
<p class="workshop-text text-info">{{event.mesto}}</p>
</div>
>>>>>>> origin/master
</div>
</div>

<<<<<<< HEAD
<div class="row">
<div class="col-lg-8 col-lg-offset-2 workshop" ng-if="thisEvent">
<h2 class="workshop-title">{{thisEvent.ime}}</h2>
<img class="col-md-12 workshop-image img-responsive" src="{{thisEvent.img}}"/>
<p class="workshop-text text-info">{{thisEvent.mesto}}</p>
</div>
</div>
||||||| merged common ancestors
<div class="col-lg-8 col-lg-offset-2 workshop" ng-if="thisEvent">
<h2 class="workshop-title">{{thisEvent.ime}}</h2>
<img class="col-md-12 workshop-image img-responsive" src="{{thisEvent.img}}"/>
<p class="workshop-text text-info">{{thisEvent.mesto}}</p>
</div>
=======
<div class="col-lg-8 col-lg-offset-2 workshop" ng-if="thisEvent">
<h2 class="workshop-title">{{thisEvent.ime}}</h2>
<img class="col-md-12 workshop-image img-responsive" src="{{thisEvent.img}}" />
<p class="workshop-text text-info">{{thisEvent.mesto}}</p>
<div class="row">
<div class="col-lg-8 col-lg-offset-2 workshop" ng-if="thisEvent">
<h2 class="workshop-title">{{thisEvent.ime}}</h2>
<img class="col-md-12 workshop-image img-responsive" src="{{thisEvent.img}}"/>
<p class="workshop-text text-info">{{thisEvent.mesto}}</p>
</div>
</div>

</section>
>>>>>>> origin/master