Skip to content

Commit

Permalink
fix a couple more
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidnewhall
davidnewhall committed Aug 4, 2024
1 parent 21d9f83 commit 30a9bfe
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 17 deletions.
26 changes: 19 additions & 7 deletions pkg/bindata/templates/media/tautulli.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ <h2 class="mb-3" style="margin-bottom:-45px">Tautulli</h2>
<span class="dialogTitle">Interval</span>
</td>
<td>
<div style="display:none;" class="dialogText">This controls the maximum duration a request to this application may elapse. Selecting <b>No Timeout</b> can be dangerous. Selecting <b>Disabled</b> completely disables the instance.</div>
<div style="display:none;" class="dialogText">
This controls the maximum duration a request to this application may elapse.
Selecting <b>No Timeout</b> can be dangerous. Selecting <b>Disabled</b> completely disables the instance.
</div>
<a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
<span class="dialogTitle">Timeout</span>
</td>
Expand All @@ -40,7 +43,9 @@ <h2 class="mb-3" style="margin-bottom:-45px">Tautulli</h2>
<tr{{if (lt .Config.Apps.Tautulli.Timeout.Seconds (add 0 0))}} class="bk-danger"{{end}}>
<td>
<div class="btn-group" role="group" style="display:flex;font-size:18px;">
<button onClick="testInstance($(this), 'Tautulli', '1')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;"><i class="fas fa-check-double"></i></button>
<button onClick="testInstance($(this), 'Tautulli', '1')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;">
<i class="fas fa-check-double"></i>
</button>
</div>
</td>
<td>
Expand Down Expand Up @@ -76,9 +81,12 @@ <h2 class="mb-3" style="margin-bottom:-45px">Tautulli</h2>
<span class="dialogTitle" style="display:none;">Variable: {{printf "%s_TAUTULLI_URL" .Flags.EnvPrefix}}</span>
</div>
{{- end}}
<input type="text" onChange="showhttps($(this).val(), '#TautulliSSL');" id="Apps.Tautulli.URL" name="Apps.Tautulli.URL" class="client-parameter form-control input-sm" data-group="media" data-label="Tautulli URL" data-original="{{.Config.Apps.Tautulli.URL}}" value="{{.Config.Apps.Tautulli.URL}}">
<input type="text" onChange="showhttps($(this).val(), '#TautulliSSL');" id="Apps.Tautulli.URL" name="Apps.Tautulli.URL"
class="client-parameter form-control input-sm" data-group="media" data-label="Tautulli URL"
data-original="{{.Config.Apps.Tautulli.URL}}" value="{{.Config.Apps.Tautulli.URL}}">
<div style="width:30px; max-width:30px;{{if not (contains .Config.Apps.Tautulli.URL "https://")}}display:none;{{end}}" id="TautulliSSL" class="input-group-addon input-sm">
<input type="checkbox" id="Apps.Tautulli.ValidSSL" name="Apps.Tautulli.ValidSSL" data-app="Tautulli" class="client-parameter" data-group="media" data-label="Tautulli SSL" data-original="{{.Config.Apps.Tautulli.ValidSSL}}" {{if .Config.Apps.Tautulli.ValidSSL}}checked {{end}}value="true">
<input type="checkbox" id="Apps.Tautulli.ValidSSL" name="Apps.Tautulli.ValidSSL" data-app="Tautulli" class="client-parameter" data-group="media"
data-label="Tautulli SSL" data-original="{{.Config.Apps.Tautulli.ValidSSL}}" {{if .Config.Apps.Tautulli.ValidSSL}}checked {{end}}value="true">
</div>
</div>
</div>
Expand All @@ -100,7 +108,9 @@ <h2 class="mb-3" style="margin-bottom:-45px">Tautulli</h2>
<input type="password" autocomplete="off" id="Apps.Tautulli.APIKey" name="Apps.Tautulli.APIKey"
data-app="Tautulli" class="client-parameter form-control input-sm" data-group="media" data-label="Tautulli API Key"
data-original="{{.Input.Apps.Tautulli.APIKey}}" value="{{.Input.Apps.Tautulli.APIKey}}">
<div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Tautulli.APIKey', $(this).find('i'));"><i class="fas fa-low-vision secret-input"></i></div>
<div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Apps.Tautulli.APIKey', $(this).find('i'));">
<i class="fas fa-low-vision secret-input"></i>
</div>
</div>
</div>
</form>
Expand All @@ -118,7 +128,8 @@ <h2 class="mb-3" style="margin-bottom:-45px">Tautulli</h2>
<span class="dialogTitle" style="display:none;">Variable: {{printf "%s_TAUTULLI_INTERVAL" .Flags.EnvPrefix}}</span>
</div>
{{- end}}
<select type="select" id="Apps.Tautulli.Interval" name="Apps.Tautulli.Interval" class="client-parameter form-control input-sm" data-group="media" data-label="Tautulli Interval" data-original="{{.Config.Apps.Tautulli.Interval}}">
<select type="select" id="Apps.Tautulli.Interval" name="Apps.Tautulli.Interval" class="client-parameter form-control input-sm" data-group="media"
data-label="Tautulli Interval" data-original="{{.Config.Apps.Tautulli.Interval}}">
{{template "includes/intervaloptions.html" $.Config.Apps.Tautulli.Interval}}
</select>
</div>
Expand All @@ -138,7 +149,8 @@ <h2 class="mb-3" style="margin-bottom:-45px">Tautulli</h2>
<span class="dialogTitle" style="display:none;">Variable: {{printf "%s_TAUTULLI_TIMEOUT" .Flags.EnvPrefix}}</span>
</div>
{{- end}}
<select type="select" id="Apps.Tautulli.extraConfig.Timeout" name="Apps.Tautulli.extraConfig.Timeout" class="client-parameter form-control input-sm" data-group="media" data-label="Tautulli Timeout" data-original="{{.Config.Apps.Tautulli.Timeout}}">
<select type="select" id="Apps.Tautulli.extraConfig.Timeout" name="Apps.Tautulli.extraConfig.Timeout" class="client-parameter form-control input-sm"
data-group="media" data-label="Tautulli Timeout" data-original="{{.Config.Apps.Tautulli.Timeout}}">
<option value="-1s" {{if eq $.Config.Tautulli.Timeout.Seconds (add -1 0)}}selected {{end}}>Disabled</option>
{{- range $i := one259 }}
<option {{if eq $.Config.Apps.Tautulli.Timeout.Seconds $i}}selected {{end}}value="{{$i}}s">{{$i}} second{{if not (eq $i (add 0 1))}}s{{end}}</option>
Expand Down
42 changes: 32 additions & 10 deletions pkg/bindata/templates/snapshot/mysql.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,17 @@ <h3><i class="fas fa-comment text-orange"></i> MySQL Notes</h3>
<div style="float: left;"><img src="{{files}}/images/logo/mysql.png" style="height:50px;"></div>
<h2 style="margin-bottom:-45px">MySQL</h2>
<div style="float: right;">
<button id="snaps-MySQL-addbutton" onclick="addInstance('snaps', 'MySQL')" data-prefix="Snapshot" data-names='["Name","Host","User","Pass","Interval","Timeout"]' type="button" class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
<button id="snaps-MySQL-addbutton" onclick="addInstance('snaps', 'MySQL')" data-prefix="Snapshot"
data-names='["Name","Host","User","Pass","Interval","Timeout"]' type="button" class="add-new-item-button btn btn-primary">
<i class="fa fa-plus"></i>
</button>
</div>
</td>
<td colspan="7" class="tablet-hide desktop-hide">
<button id="snaps-MySQL-addbutton" onclick="addInstance('snaps', 'MySQL')" data-prefix="Snapshot" data-names='["Name","Host","User","Pass","Interval","Timeout"]' type="button" class="add-new-item-button btn btn-primary"><i class="fa fa-plus"></i></button>
<button id="snaps-MySQL-addbutton" onclick="addInstance('snaps', 'MySQL')" data-prefix="Snapshot"
data-names='["Name","Host","User","Pass","Interval","Timeout"]' type="button" class="add-new-item-button btn btn-primary">
<i class="fa fa-plus"></i>
</button>
<h2 style="margin-left:5px;display:inline;">MySQL</h2>
<div style="float:right;"><img src="{{files}}/images/logo/mysql.png" style="height:50px;"></div>
</td>
Expand All @@ -32,7 +38,9 @@ <h2 style="margin-left:5px;display:inline;">MySQL</h2>
<span class="dialogTitle">Actions</span>
</td>
<td style="min-width:120px;">
<div style="display:none;" class="dialogText">Name is optional, but required to be unique if you wish to enable service checks on the instance. Otherwise, it's used to identify the instance easier.</div>
<div style="display:none;" class="dialogText">
Name is optional, but required to be unique if you wish to enable service checks on the instance. Otherwise, it's used to identify the instance easier.
</div>
<a onClick="dialog($(this), 'left')" class="help-icon far fa-question-circle"></a>
<span class="dialogTitle">Name</span>
</td>
Expand All @@ -57,21 +65,29 @@ <h2 style="margin-left:5px;display:inline;">MySQL</h2>
<span class="dialogTitle">Interval</span>
</td>
<td style="min-width:120px;width:120px">
<div style="display:none;" class="dialogText">This controls the maximum duration a request to this application may elapse. Selecting <b>No Timeout</b> can be dangerous. Selecting <b>Disabled</b> completely disables the instance.</div>
<div style="display:none;" class="dialogText">
This controls the maximum duration a request to this application may elapse.
Selecting <b>No Timeout</b> can be dangerous. Selecting <b>Disabled</b> completely disables the instance.
</div>
<a onClick="dialog($(this), 'right')" class="help-icon far fa-question-circle"></a>
<span class="dialogTitle">Timeout</span>
</td>
</tr>
</thead>
<tbody id="snaps-MySQL-container">
{{- range $index, $app := .Config.Snapshot.MySQL}}
<input disabled style="display: none;" class="client-parameter snaps-MySQL{{$index}}-deleted" data-group="snaps" data-label="MySQL {{instance $index}} Deleted" data-original="false" value="false">
<input disabled style="display: none;" class="client-parameter snaps-MySQL{{$index}}-deleted" data-group="snaps"
data-label="MySQL {{instance $index}} Deleted" data-original="false" value="false">
<tr class="snaps-MySQL {{if (lt $app.Timeout.Seconds (add 0 0))}}bk-danger{{end}}" id="snaps-MySQL-{{$index}}">
<td style="white-space:nowrap;">
<div class="btn-group" role="group" style="display:flex;font-size:18px;">
<button onclick="removeInstance('snaps-MySQL', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:16px;width:35px;"><i class="fa fa-minus"></i></button>
<button onclick="removeInstance('snaps-MySQL', {{$index}})" type="button" class="delete-item-button btn btn-danger btn-sm" style="font-size:16px;width:35px;">
<i class="fa fa-minus"></i>
</button>
<button id="MySQLIndexLabel{{$index}}" class="btn btn-sm" style="font-size:18px;width:35px;pointer-events:none;">{{instance $index}}</button>
<button onClick="testInstance($(this), 'MySQL', '{{$index}}')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;"><i class="fas fa-check-double"></i></button>
<button onClick="testInstance($(this), 'MySQL', '{{$index}}')" type="button" class="btn btn-success btn-sm checkInstanceBtn" style="font-size:18px;">
<i class="fas fa-check-double"></i>
</button>
</div>
</td>
<td>
Expand Down Expand Up @@ -150,7 +166,9 @@ <h2 style="margin-left:5px;display:inline;">MySQL</h2>
<input type="password" autocomplete="off" id="Snapshot.MySQL.{{$index}}.Pass" name="Snapshot.MySQL.{{$index}}.Pass" data-index="{{$index}}"
data-app="MySQL" class="client-parameter form-control input-sm" data-group="snaps" data-label="MySQL {{instance $index}} Pass"
data-original="{{(index $.Input.Snapshot.MySQL $index).Pass}}" value="{{(index $.Input.Snapshot.MySQL $index).Pass}}">
<div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Snapshot.MySQL.{{$index}}.Pass', $(this).find('i'));"><i class="fas fa-low-vision secret-input"></i></div>
<div style="width:35px; max-width:35px;" class="input-group-addon input-sm" onClick="togglePassword('Snapshot.MySQL.{{$index}}.Pass', $(this).find('i'));">
<i class="fas fa-low-vision secret-input"></i>
</div>
</div>
</div>
</form>
Expand All @@ -168,7 +186,9 @@ <h2 style="margin-left:5px;display:inline;">MySQL</h2>
<span class="dialogTitle" style="display:none;">Variable: {{printf "%s_SNAPSHOT_MYSQL_%d_INTERVAL" $.Flags.EnvPrefix $index}}</span>
</div>
{{- end}}
<select type="select" id="Snapshot.MySQL.{{$index}}.Interval" name="Snapshot.MySQL.{{$index}}.Interval" data-index="{{$index}}" data-app="MySQL" class="client-parameter form-control input-sm" data-group="snaps" data-label="MySQL {{instance $index}} Interval" data-original="{{$app.Interval}}">
<select type="select" id="Snapshot.MySQL.{{$index}}.Interval" name="Snapshot.MySQL.{{$index}}.Interval" data-index="{{$index}}"
class="client-parameter form-control input-sm" data-label="MySQL {{instance $index}} Interval"
data-app="MySQL" data-group="snaps" data-original="{{$app.Interval}}">
{{template "includes/intervaloptions.html" $app.Interval}}
</select>
</div>
Expand All @@ -188,7 +208,9 @@ <h2 style="margin-left:5px;display:inline;">MySQL</h2>
<span class="dialogTitle" style="display:none;">Variable: {{printf "%s_SNAPSHOT_MYSQL_%d_TIMEOUT" $.Flags.EnvPrefix $index}}</span>
</div>
{{- end}}
<select type="text" id="Snapshot.MySQL.{{$index}}.Timeout" name="Snapshot.MySQL.{{$index}}.Timeout" data-index="{{$index}}" data-app="MySQL" class="client-parameter form-control input-sm" data-group="snaps" data-label="MySQL {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
<select type="text" id="Snapshot.MySQL.{{$index}}.Timeout" name="Snapshot.MySQL.{{$index}}.Timeout" data-index="{{$index}}"
data-app="MySQL" class="client-parameter form-control input-sm" data-group="snaps"
data-label="MySQL {{instance $index}} Timeout" data-original="{{$app.Timeout}}">
<option value="-1s">Disabled</option>
<option value="0s">No Timeout</option>
{{- range $i := one259 }}
Expand Down

0 comments on commit 30a9bfe

Please sign in to comment.