Skip to content
Permalink
Browse files

Merge branch '1.11.0'

  • Loading branch information...
Sebastian
Sebastian committed Nov 25, 2018
2 parents 22c35f3 + 169c1f8 commit a39665e9267b026874740907ef234c825c045be7
@@ -3,7 +3,7 @@
<head>
<title>{browserTitle}</title>
<!-- BEGIN metaTags -->{function.buildMetaTag}<!-- END metaTags -->
<link rel="stylesheet" type="text/css" href="{relative_path}/assets/stylesheet<!-- IF bootswatchSkin -->-{bootswatchSkin}<!-- END -->.css?{config.cache-buster}" />
<link rel="stylesheet" type="text/css" href="{relative_path}/assets/client<!-- IF bootswatchSkin -->-{bootswatchSkin}<!-- END -->.css?{config.cache-buster}" />
<!-- BEGIN linkTags -->{function.buildLinkTag}<!-- END linkTags -->

<script>
@@ -0,0 +1,19 @@
<div component="category/dropdown" class="btn-group pull-right category-dropdown-container bottom-sheet <!-- IF !categories.length -->hidden<!-- ENDIF !categories.length -->">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<!-- IF selectedCategory --><span class="fa-stack" style="{function.generateCategoryBackground, selectedCategory}"><i class="fa fa-fw fa-stack-1x {selectedCategory.icon}" style="color: {selectedCategory.color};"></i></span> {selectedCategory.name}<!-- ELSE -->
[[unread:all_categories]]<!-- ENDIF selectedCategory --> <span class="caret"></span>
</button>
<div component="category-selector-search" class="hidden">
<input type="text" class="form-control" autocomplete="off">
</div>
<ul component="category/list" class="dropdown-menu category-dropdown-menu" role="menu">
<li role="presentation" class="category">
<a role="menu-item" href="{config.relative_path}/{allCategoriesUrl}"><i class="fa fa-fw <!-- IF !selectedCategory -->fa-check<!-- ENDIF !selectedCategory -->"></i> [[unread:all_categories]]</a>
</li>
<!-- BEGIN categories -->
<li role="presentation" class="category" data-cid="{categories.cid}" data-parent-cid="{categories.parentCid}" data-name="{categories.name}">
<a role="menu-item" href="#"><i component="category/select/icon" class="fa fa-fw <!-- IF categories.selected -->fa-check<!-- ENDIF categories.selected -->"></i>{categories.level}<!-- IF categories.icon --><span class="fa-stack" style="{function.generateCategoryBackground}"><i class="fa fa-fw fa-stack-1x {categories.icon}" style="color: {categories.color};"></i></span><!-- ENDIF categories.icon --> {categories.name}</a>
</li>
<!-- END categories -->
</ul>
</div>
@@ -2,10 +2,16 @@
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span component="category-selector-selected">[[topic:thread_tools.select_category]]</span> <span class="caret"></span>
</button>
<ul class="dropdown-menu category-dropdown-menu" role="menu">
<div component="category-selector-search" class="hidden">
<input type="text" class="form-control" autocomplete="off">
</div>
<ul component="category/list" class="dropdown-menu category-dropdown-menu" role="menu">
<li component="category/no-matches" role="presentation" class="category hidden">
<a role="menu-item">[[search:no-matches]]</a>
</li>
<!-- BEGIN categories -->
<li role="presentation" class="category <!-- IF categories.disabledClass -->disabled<!-- ENDIF categories.disabledClass -->" data-cid="{categories.cid}" data-name="{categories.name}">
<a role="menu-item">{categories.level}<span component="category-markup"><!-- IF categories.icon --><span class="fa-stack"><i style="color: {categories.bgColor};" class="fa fa-circle fa-stack-2x"></i><i style="color: {categories.color};" class="fa fa-stack-1x fa-fw {categories.icon}"></i></span><!-- ENDIF categories.icon --> {categories.name}</span></a>
<a role="menu-item">{categories.level}<span component="category-markup"><!-- IF categories.icon --><span class="fa-stack" style="{function.generateCategoryBackground}"><i style="color: {categories.color};" class="fa fa-stack-1x fa-fw {categories.icon}"></i></span><!-- ENDIF categories.icon --> {categories.name}</span></a>
</li>
<!-- END categories -->
</ul>
@@ -20,6 +20,13 @@
<option value="tags">[[tags:tags]]</option>
</select>
</div>
<div class="col-md-3">
<label>[[search:match-words]]</label>
<select id="match-words-filter" class="form-control">
<option value="all">[[search:all]]</option>
<option value="any">[[search:any]]</option>
</select>
</div>
<div class="col-md-2">
<label>[[search:match-words]]</label>
<select id="match-words-filter" class="form-control">

0 comments on commit a39665e

Please sign in to comment.
You can’t perform that action at this time.