Skip to content

Commit

Permalink
Icon updates / .less path fix Kunena#4730 Port K50
Browse files Browse the repository at this point in the history
  • Loading branch information
Jelle Kok committed Oct 10, 2016
1 parent 3968afc commit 88fcb77
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 64 deletions.
8 changes: 4 additions & 4 deletions src/components/com_kunena/template/crypsis/layouts/search/form/default.php
View file
Expand Up @@ -110,8 +110,8 @@
<div id="searchatdate">
<div class="input-append date">
<input type="text" name="searchatdate" data-date-format="mm/dd/yyyy"
value="<?php echo JFactory::getDate()->format('m/d/Y'); ?>"> <span class="add-on"><i
class="icon-grid-view-2 "></i></span>
value="<?php echo JFactory::getDate()->format('m/d/Y'); ?>">
<span class="input-group-addon"><?php echo KunenaIcons::calendar();?></span>
</div>
</div>
</fieldset>
Expand Down Expand Up @@ -182,10 +182,10 @@ class="icon-grid-view-2 "></i></span>

<div class="center">
<button type="submit" class="btn btn-primary">
<i class="icon-search icon-white"></i><?php echo(' ' . JText::_('COM_KUNENA_SEARCH_SEND') . ' '); ?>
<?php echo KunenaIcons::search() . ' ' . JText::_('COM_KUNENA_SEARCH_SEND'); ?>
</button>
<button type="reset" class="btn" onclick="window.history.back();">
<i class="icon-cancel"></i><?php echo(' ' . JText::_('COM_KUNENA_CANCEL') . ' '); ?>
<?php echo KunenaIcons::cancel() . ' ' . JText::_('COM_KUNENA_CANCEL'); ?>
</button>
</div>
</div>
Expand Down
113 changes: 54 additions & 59 deletions src/components/com_kunena/template/crypsisb3/layouts/search/form/default.php
View file
Expand Up @@ -39,7 +39,7 @@

<div class="btn-toolbar pull-right">
<div class="btn-group">
<button class="btn btn-default btn-small <?php echo KunenaIcons::collapse(); ?>" type="button" data-toggle="collapse"
<button class="btn btn-default btn-sm <?php echo KunenaIcons::collapse(); ?>" type="button" data-toggle="collapse"
data-target="#search" aria-expanded="false" aria-controls="search"></button>
</div>
</div>
Expand All @@ -55,15 +55,16 @@
<?php echo JText::_('COM_KUNENA_SEARCH_SEARCHBY_KEYWORD'); ?>
</legend>
<div class="col-md-6">
<label>
<?php echo JText::_('COM_KUNENA_SEARCH_KEYWORDS'); ?>:
<div class="form-group">
<input type="text" name="query" class="form-control"
value="<?php echo $this->escape($this->state->get('searchwords')); ?>"/>
</label>
value="<?php echo $this->escape($this->state->get('searchwords')); ?>"
placeholder="<?php echo JText::_('COM_KUNENA_SEARCH_KEYWORDS'); ?>" />
</div>
</div>
<div class="col-md-6">
<br>
<?php $this->displayModeList('mode'); ?>
<div class="form-group">
<?php $this->displayModeList('mode'); ?>
</div>
</div>
</fieldset>

Expand All @@ -72,26 +73,24 @@
<legend>
<?php echo JText::_('COM_KUNENA_SEARCH_SEARCHBY_USER'); ?>
</legend>
<label>
<?php echo JText::_('COM_KUNENA_SEARCH_UNAME'); ?>:
<div class="form-group">
<input id="kusersearch" type="text" name="searchuser" class="form-control"
value="<?php echo $this->escape($this->state->get('query.searchuser')); ?>"/>
</label>
<br>
<label>
<?php echo JText::_('COM_KUNENA_SEARCH_EXACT'); ?>:
<input type="checkbox" name="exactname" value="1"
<?php if ($this->state->get('query.exactname'))
{
echo $this->checked;
} ?> />
</label>
value="<?php echo $this->escape($this->state->get('query.searchuser')); ?>"
placeholder="<?php echo JText::_('COM_KUNENA_SEARCH_UNAME'); ?>" />
<div class="checkbox">
<label>
<input type="checkbox" name="exactname" value="1"
<?php if ($this->state->get('query.exactname')) { echo $this->checked; } ?> />
<?php echo JText::_('COM_KUNENA_SEARCH_EXACT'); ?>
</label>
</div>
</div>
</fieldset>
<?php endif; ?>
</div>
</div>

<button type="button" class="btn btn-default btn-small pull-right <?php echo KunenaIcons::collapse(); ?>" data-toggle="collapse"
<button type="button" class="btn btn-default btn-sm pull-right <?php echo KunenaIcons::collapse(); ?>" data-toggle="collapse"
data-target="#search-options" aria-expanded="false" aria-controls="search-options"></button>
<h2>
<?php echo JText::_('COM_KUNENA_SEARCH_OPTIONS'); ?>
Expand All @@ -104,10 +103,8 @@
<legend>
<?php echo JText::_('COM_KUNENA_SEARCH_FIND_POSTS'); ?>
</legend>
<div class="col-md-6">
<div class="form-group">
<?php $this->displayDateList('date'); ?>
</div>
<div class="col-md-6">
<?php $this->displayBeforeAfterList('beforeafter'); ?>
</div>
</fieldset>
Expand All @@ -116,10 +113,8 @@
<legend>
<?php echo JText::_('COM_KUNENA_SEARCH_SORTBY'); ?>
</legend>
<div class="col-md-6">
<div class="form-group">
<?php $this->displaySortByList('sort'); ?>
</div>
<div class="col-md-6">
<?php $this->displayOrderList('order'); ?>
</div>
</fieldset>
Expand All @@ -128,19 +123,21 @@
<legend>
<?php echo JText::_('COM_KUNENA_SEARCH_AT_A_SPECIFIC_DATE'); ?>
</legend>
<div class="col-md-6" id="searchatdate">
<div class="input-group date">
<input class="form-control" type="text" name="searchatdate" data-date-format="mm/dd/yyyy"
value="<?php echo JFactory::getDate()->format('m/d/Y'); ?>"> <span class="add-on"><i
class="icon-grid-view-2 "></i></span>
<div class="col-md-6">
<div class="form-group" id="searchatdate">
<div class="input-group date">
<input class="form-control" type="text" name="searchatdate" data-date-format="mm/dd/yyyy"
value="<?php echo JFactory::getDate()->format('m/d/Y'); ?>">
<span class="input-group-addon"><?php echo KunenaIcons::calendar();?></span>
</div>
</div>
</div>
</fieldset>
</div>

<div class="row">
<div class="col-md-6">
<fieldset>
<fieldset class="form-group">
<legend>
<?php echo JText::_('COM_KUNENA_SEARCH_START'); ?>
</legend>
Expand All @@ -158,33 +155,31 @@ class="icon-grid-view-2 "></i></span>
<legend>
<?php echo JText::_('COM_KUNENA_SEARCH_SHOW'); ?>
</legend>
<label class="radio">
<input type="radio" name="show" value="0"
<?php if ($this->state->get('query.show') == 0)
{
echo 'checked="checked"';
} ?> />
<?php echo JText::_('COM_KUNENA_SEARCH_SHOW_NORMAL'); ?>
</label>
<label class="radio">
<input type="radio" name="show" value="1"
<?php if ($this->state->get('query.show') == 1)
{
echo 'checked="checked"';
} ?> />
<?php echo JText::_('COM_KUNENA_SEARCH_SHOW_UNAPPROVED'); ?>
</label>
<label class="radio">
<input type="radio" name="show" value="2"
<?php if ($this->state->get('query.show') == 2)
{
echo 'checked="checked"';
} ?> />
<?php echo JText::_('COM_KUNENA_SEARCH_SHOW_TRASHED'); ?>
</label>
<div class="radio">
<label>
<input type="radio" name="show" value="0"
<?php if ($this->state->get('query.show') == 0) { echo 'checked="checked"'; } ?> />
<?php echo JText::_('COM_KUNENA_SEARCH_SHOW_NORMAL'); ?>
</label>
</div>

<div class="radio">
<label>
<input type="radio" name="show" value="1"
<?php if ($this->state->get('query.show') == 1) { echo 'checked="checked"'; } ?> />
<?php echo JText::_('COM_KUNENA_SEARCH_SHOW_UNAPPROVED'); ?>
</label>
</div>

<div class="radio">
<label>
<input type="radio" name="show" value="2"
<?php if ($this->state->get('query.show') == 2) { echo 'checked="checked"'; } ?> />
<?php echo JText::_('COM_KUNENA_SEARCH_SHOW_TRASHED'); ?>
</label>
</div>
</fieldset>
<?php endif; ?>

</div>

<fieldset class="col-md-6">
Expand All @@ -205,7 +200,7 @@ class="icon-grid-view-2 "></i></span>
</div>
</div>

<div class="center">
<div class="text-center">
<button type="submit" class="btn btn-primary">
<?php echo KunenaIcons::search(); ?><?php echo(' ' . JText::_('COM_KUNENA_SEARCH_SEND') . ' '); ?>
</button>
Expand Down
2 changes: 1 addition & 1 deletion src/components/com_kunena/template/crypsisb3/template.php
View file
Expand Up @@ -102,7 +102,7 @@ public function initialize()
$this->compileLess('assets/less/crypsisb3.less', 'kunena.css');
$this->addStyleSheet('kunena.css');

$filenameless = JPATH_SITE . '/components/com_kunena/template/crypsis/assets/less/custom.less';
$filenameless = JPATH_SITE . '/components/com_kunena/template/crypsisb3/assets/less/custom.less';

if (file_exists($filenameless) && 0 != filesize($filenameless))
{
Expand Down

0 comments on commit 88fcb77

Please sign in to comment.