tcjlj/ZeroOmega
1
0
Fork 0
mirror of https://github.com/zero-peak/ZeroOmega.git synced 2025-01-22 23:08:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix #275 condition help not being shown in SwitchProfile.

Browse Source
This commit is contained in:
FelisCatus 2015-02-11 11:24:35 +08:00
parent 5b27fe9c9b
commit 5ed8b5b41c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
omega-web/src/omega/controllers/switch_profile.coffee
View File

@ -52,7 +52,8 @@ angular.module('omega').controller 'SwitchProfileCtrl', ($scope, $rootScope,
saveAs(blob, "SwitchyRules_#{fileName}.ssrl") saveAs(blob, "SwitchyRules_#{fileName}.ssrl")
# == Condition types == # == Condition types ==
$scope.showConditionHelp = ($location.search().help == 'condition') $scope.conditionHelp =
show: ($location.search().help == 'condition')
$scope.basicConditionTypes = [ $scope.basicConditionTypes = [
{ {

6
omega-web/src/partials/profile_switch.jade
View File

@ -1,8 +1,8 @@
div(ng-controller='SwitchProfileCtrl') div(ng-controller='SwitchProfileCtrl')
section.condition-help-section.settings-group(ng-show='showConditionHelp' ng-init='expandedSection = {id: 0}') section.condition-help-section.settings-group(ng-show='conditionHelp.show' ng-init='expandedSection = {id: 0}')
h3 h3
| {{'options_group_conditionHelp' | tr}} | {{'options_group_conditionHelp' | tr}}
button.close.close-condition-help(type='button' ng-click='showConditionHelp = false') button.close.close-condition-help(type='button' ng-click='conditionHelp.show = false')
span(aria-hidden='true') × span(aria-hidden='true') ×
span.sr-only {{'dialog_close' | tr}} span.sr-only {{'dialog_close' | tr}}
div.condition-help(ng-repeat='group in (showConditionTypes == 0 ? basicConditionTypes : advancedConditionTypes)') div.condition-help(ng-repeat='group in (showConditionTypes == 0 ? basicConditionTypes : advancedConditionTypes)')
@ -44,7 +44,7 @@ div(ng-controller='SwitchProfileCtrl')
= ' ' = ' '
button.btn.btn-link.btn-sm.clear-padding.toggle-condition-help( button.btn.btn-link.btn-sm.clear-padding.toggle-condition-help(
title='{{"options_showConditionTypeHelp" | tr}}' title='{{"options_showConditionTypeHelp" | tr}}'
ng-click='showConditionHelp = !showConditionHelp') ng-click='conditionHelp.show = !conditionHelp.show')
span.glyphicon.glyphicon-question-sign span.glyphicon.glyphicon-question-sign
th {{'options_conditionDetails' | tr}} th {{'options_conditionDetails' | tr}}
th {{'options_resultProfile' | tr}} th {{'options_resultProfile' | tr}}