help block added

This commit is contained in:
Athou
2014-11-10 09:12:10 +01:00
parent a94ef980bb
commit 281e015376
3 changed files with 9 additions and 2 deletions

View File

@@ -98,6 +98,8 @@
"next_refresh" : "Next refresh", "next_refresh" : "Next refresh",
"queued_for_refresh" : "Queued for refresh", "queued_for_refresh" : "Queued for refresh",
"feed_url" : "Feed URL", "feed_url" : "Feed URL",
"filtering_expression" : "Filtering expression",
"filtering_expression_help" : "If not empty, an expression evaluating to 'true' or 'false'. If false, new entries for this feed will be marked as read automatically.\nAvailable variables are 'title', 'content', 'url' and 'author' and their content is converted to lower case for convenience.\nExample: url.contains('youtube') or (author eq 'athou' and title.contains('github').\nComplete available syntax is available <a href='http://commons.apache.org/proper/commons-jexl/reference/syntax.html' target='_blank'>here</a>.",
"generate_api_key_first" : "Generate an API key in your profile first.", "generate_api_key_first" : "Generate an API key in your profile first.",
"unsubscribe" : "Unsubscribe", "unsubscribe" : "Unsubscribe",
"unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed?", "unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed?",

View File

@@ -43,6 +43,10 @@ label {
display: block; display: block;
} }
.pre-wrap {
white-space: pre-wrap;
}
.form-horizontal .control-group { .form-horizontal .control-group {
margin-bottom: 10px; margin-bottom: 10px;
} }

View File

@@ -71,9 +71,10 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">Filtering expression</label> <label class="col-sm-2 control-label">{{ 'details.filtering_expression' | translate }}</label>
<div class="col-sm-10 checkbox"> <div class="col-sm-10 form-control-static">
<input type="text" name="filter" ng-model="sub.filter" class="form-control"></input> <input type="text" name="filter" ng-model="sub.filter" class="form-control"></input>
<p class="help-block pre-wrap" ng-bind-html="'details.filtering_expression_help' | translate"></p>
</div> </div>
</div> </div>