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.

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

Update to bs4 #74

Open
wants to merge 1 commit 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
6 changes: 3 additions & 3 deletions asset/css/front.css
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ a.item-ribbon:hover {
}


.table.table-striped .btn-success.btn-xs:focus,
.table.table-striped .btn-success.btn-xs {
.table.table-striped .btn-success.btn-sm:focus,
.table.table-striped .btn-success.btn-sm {
padding: 1px 5px;
}

Expand All @@ -213,7 +213,7 @@ a.item-ribbon:hover {
}

@media screen and (max-width: 991px) {
.col-xs-3.event-single-image{
.col-3.event-single-image{
padding-right:0;
}

Expand Down
30 changes: 15 additions & 15 deletions asset/ng-template/front/event-list.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="clearfix pi-item-list">
<div class="col-xs-12 col-md-3">
<div class="pi-item-search-form clearfix well well-sm">
<div class="col-12 col-md-3">
<div class="pi-item-search-form clearfix card card-body bg-light mb-3">
<div class="page-header">
<h3>{{'SEARCH' | translate}}</h3>
</div>
Expand Down Expand Up @@ -48,12 +48,12 @@ <h3>{{'SEARCH' | translate}}</h3>
</form>
</div>
<!-- <div class="clearfix" data-ng-if="condition.description">
<div class="well small">
<div class="card card-body bg-light mb-3 small">
{{condition.description}}
</div>
</div> -->
</div>
<div class="col-xs-12 col-md-9">
<div class="col-12 col-md-9">
<div class="clearfix">
<div class="page-header">
<h1>{{condition.title}}</h1>
Expand All @@ -62,19 +62,19 @@ <h1>{{condition.title}}</h1>
<div class="row">
<div ng-repeat="event in events" class="event-single clearfix h-event" itemscope itemtype="https://schema.org/Event">
<div class="row">
<div class="col-xs-12 col-md-3 event-single-image">
<div class="col-12 col-md-3 event-single-image">
<div class="text-center">
<a itemprop="url" title="{{event.title}}"
data-ng-href="{{event.eventUrl}}">
<img itemprop="image" class="img-responsive img-rounded u-photo center-block"
<img itemprop="image" class="img-fluid rounded u-photo center-block"
src="#"
data-ng-src="{{event.thumbUrl}}"
alt="{{event.title}}"/>
</a>
</div>
</div>
<div ng-if="condition.importantOrganizer == 1">
<div class="col-xs-12 col-md-7 event-single-body">
<div class="col-12 col-md-7 event-single-body">
<div class="p-name clearfix" itemprop="name">
<h2 class="event-single-title">
<a itemprop="url" title="{{event.title}}"
Expand All @@ -85,18 +85,18 @@ <h2 class="event-single-title">
</div>
<div class="event-single-information small">
<ul class="clearfix list-inline event-time">
<li data-ng-if="event.time_view">
<li data-ng-if="event.time_view" class="list-inline-item">
<i class="fa fa-clock-o"></i> {{event.days}} {{event.time_view}}
<meta data-ng-if="event.time_start_view" itemprop="startDate"
content="{{event.time_start_view}}"/>
<meta data-ng-if="event.time_end_view" itemprop="endDate"
content="{{event.time_end_view}}"/>
</li>
<li data-ng-if="event.register_price" class="p-price" itemprop="price"
<li data-ng-if="event.register_price" class="list-inline-item p-price" itemprop="price"
content="{{event.register_price}}">
<i class="fa fa-money"></i> {{event.register_price_view}}
</li>
<li><i class="fa fa-eye"></i> {{event.hits}}</li>
<li class="list-inline-item"><i class="fa fa-eye"></i> {{event.hits}}</li>
</ul>
<meta data-ng-if="event.register_price" itemprop="priceCurrency" content="{{event.price_currency}}"/>
</div>
Expand All @@ -105,14 +105,14 @@ <h2 class="event-single-title">
{{event.text_summary}}
</div>
</div>
<div class="col-xs-12 col-md-2">
<div class="col-12 col-md-2">
<div class="event-single-organizer">
{{event.organizer_name}}
</div>
</div>
</div>
<div ng-if="condition.importantOrganizer == 0">
<div class="col-xs-12 col-md-9 event-single-body">
<div class="col-12 col-md-9 event-single-body">
<div class="p-name clearfix" itemprop="name">
<h2 class="event-single-title">
<a itemprop="url" title="{{event.title}}"
Expand All @@ -123,18 +123,18 @@ <h2 class="event-single-title">
</div>
<div class="event-single-information small">
<ul class="clearfix list-inline event-time">
<li data-ng-if="event.time_view">
<li data-ng-if="event.time_view" class="list-inline-item">
<i class="fa fa-clock-o"></i> {{event.days}} {{event.time_view}}
<meta data-ng-if="event.time_start_view" itemprop="startDate"
content="{{event.time_start_view}}"/>
<meta data-ng-if="event.time_end_view" itemprop="endDate"
content="{{event.time_end_view}}"/>
</li>
<li data-ng-if="event.register_price" class="p-price" itemprop="price"
<li data-ng-if="event.register_price" class="list-inline-item p-price" itemprop="price"
content="{{event.register_price}}">
<i class="fa fa-money"></i> {{event.register_price_view}}
</li>
<li><i class="fa fa-eye"></i> {{event.hits}}</li>
<li class="list-inline-item"><i class="fa fa-eye"></i> {{event.hits}}</li>
</ul>
<meta data-ng-if="event.register_price" itemprop="priceCurrency" content="{{event.price_currency}}"/>
</div>
Expand Down
8 changes: 4 additions & 4 deletions config/block.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
/**
* Pi Engine (http://pialog.org)
* Pi Engine (http://piengine.org)
*
* @link http://code.pialog.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://pialog.org
* @license http://pialog.org/license.txt New BSD License
* @link http://code.piengine.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://piengine.org
* @license http://piengine.org/license.txt New BSD License
*/

/**
Expand Down
8 changes: 4 additions & 4 deletions config/comment.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
/**
* Pi Engine (http://pialog.org)
* Pi Engine (http://piengine.org)
*
* @link http://code.pialog.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://pialog.org
* @license http://pialog.org/license.txt New BSD License
* @link http://code.piengine.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://piengine.org
* @license http://piengine.org/license.txt New BSD License
*/

/**
Expand Down
8 changes: 4 additions & 4 deletions config/config.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
/**
* Pi Engine (http://pialog.org)
* Pi Engine (http://piengine.org)
*
* @link http://code.pialog.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://pialog.org
* @license http://pialog.org/license.txt New BSD License
* @link http://code.piengine.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://piengine.org
* @license http://piengine.org/license.txt New BSD License
*/

/**
Expand Down
8 changes: 4 additions & 4 deletions config/database.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
/**
* Pi Engine (http://pialog.org)
* Pi Engine (http://piengine.org)
*
* @link http://code.pialog.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://pialog.org
* @license http://pialog.org/license.txt New BSD License
* @link http://code.piengine.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://piengine.org
* @license http://piengine.org/license.txt New BSD License
*/

/**
Expand Down
8 changes: 4 additions & 4 deletions config/module.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
/**
* Pi Engine (http://pialog.org)
* Pi Engine (http://piengine.org)
*
* @link http://code.pialog.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://pialog.org
* @license http://pialog.org/license.txt New BSD License
* @link http://code.piengine.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://piengine.org
* @license http://piengine.org/license.txt New BSD License
*/

/**
Expand Down
8 changes: 4 additions & 4 deletions config/navigation.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
/**
* Pi Engine (http://pialog.org)
* Pi Engine (http://piengine.org)
*
* @link http://code.pialog.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://pialog.org
* @license http://pialog.org/license.txt New BSD License
* @link http://code.piengine.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://piengine.org
* @license http://piengine.org/license.txt New BSD License
*/

/**
Expand Down
8 changes: 4 additions & 4 deletions config/page.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
/**
* Pi Engine (http://pialog.org)
* Pi Engine (http://piengine.org)
*
* @link http://code.pialog.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://pialog.org
* @license http://pialog.org/license.txt New BSD License
* @link http://code.piengine.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://piengine.org
* @license http://piengine.org/license.txt New BSD License
*/

/**
Expand Down
8 changes: 4 additions & 4 deletions config/permission.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
/**
* Pi Engine (http://pialog.org)
* Pi Engine (http://piengine.org)
*
* @link http://code.pialog.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://pialog.org
* @license http://pialog.org/license.txt New BSD License
* @link http://code.piengine.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://piengine.org
* @license http://piengine.org/license.txt New BSD License
*/

/**
Expand Down
8 changes: 4 additions & 4 deletions config/route.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
/**
* Pi Engine (http://pialog.org)
* Pi Engine (http://piengine.org)
*
* @link http://code.pialog.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://pialog.org
* @license http://pialog.org/license.txt New BSD License
* @link http://code.piengine.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://piengine.org
* @license http://piengine.org/license.txt New BSD License
*/

/**
Expand Down
8 changes: 4 additions & 4 deletions src/Api/Breadcrumbs.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
/**
* Pi Engine (http://pialog.org)
* Pi Engine (http://piengine.org)
*
* @link http://code.pialog.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://pialog.org
* @license http://pialog.org/license.txt New BSD License
* @link http://code.piengine.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://piengine.org
* @license http://piengine.org/license.txt New BSD License
*/

/**
Expand Down
8 changes: 4 additions & 4 deletions src/Api/Comment.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
/**
* Pi Engine (http://pialog.org)
* Pi Engine (http://piengine.org)
*
* @link http://code.pialog.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://pialog.org
* @license http://pialog.org/license.txt New BSD License
* @link http://code.piengine.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://piengine.org
* @license http://piengine.org/license.txt New BSD License
*/

/**
Expand Down
8 changes: 4 additions & 4 deletions src/Api/Event.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
/**
* Pi Engine (http://pialog.org)
* Pi Engine (http://piengine.org)
*
* @link http://code.pialog.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://pialog.org
* @license http://pialog.org/license.txt New BSD License
* @link http://code.piengine.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://piengine.org
* @license http://piengine.org/license.txt New BSD License
*/

/**
Expand Down
8 changes: 4 additions & 4 deletions src/Api/Order.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
/**
* Pi Engine (http://pialog.org)
* Pi Engine (http://piengine.org)
*
* @link http://code.pialog.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://pialog.org
* @license http://pialog.org/license.txt New BSD License
* @link http://code.piengine.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://piengine.org
* @license http://piengine.org/license.txt New BSD License
*/

/**
Expand Down
8 changes: 4 additions & 4 deletions src/Api/Search.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
/**
* Pi Engine (http://pialog.org)
* Pi Engine (http://piengine.org)
*
* @link http://code.pialog.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://pialog.org
* @license http://pialog.org/license.txt New BSD License
* @link http://code.piengine.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://piengine.org
* @license http://piengine.org/license.txt New BSD License
*/

/**
Expand Down
8 changes: 4 additions & 4 deletions src/Api/Time.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
/**
* Pi Engine (http://pialog.org)
* Pi Engine (http://piengine.org)
*
* @link http://code.pialog.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://pialog.org
* @license http://pialog.org/license.txt New BSD License
* @link http://code.piengine.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://piengine.org
* @license http://piengine.org/license.txt New BSD License
*/

/**
Expand Down
8 changes: 4 additions & 4 deletions src/Block/Block.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
/**
* Pi Engine (http://pialog.org)
* Pi Engine (http://piengine.org)
*
* @link http://code.pialog.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://pialog.org
* @license http://pialog.org/license.txt New BSD License
* @link http://code.piengine.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://piengine.org
* @license http://piengine.org/license.txt New BSD License
*/

/**
Expand Down
8 changes: 4 additions & 4 deletions src/Controller/Admin/EventController.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
/**
* Pi Engine (http://pialog.org)
* Pi Engine (http://piengine.org)
*
* @link http://code.pialog.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://pialog.org
* @license http://pialog.org/license.txt New BSD License
* @link http://code.piengine.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://piengine.org
* @license http://piengine.org/license.txt New BSD License
*/

/**
Expand Down
8 changes: 4 additions & 4 deletions src/Controller/Admin/IndexController.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
/**
* Pi Engine (http://pialog.org)
* Pi Engine (http://piengine.org)
*
* @link http://code.pialog.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://pialog.org
* @license http://pialog.org/license.txt New BSD License
* @link http://code.piengine.org for the Pi Engine source repository
* @copyright Copyright (c) Pi Engine http://piengine.org
* @license http://piengine.org/license.txt New BSD License
*/

/**
Expand Down
Loading