Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFS Gluon Firmware Selector
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
firmware
FFS Gluon Firmware Selector
Commits
343c2cda
Commit
343c2cda
authored
6 years ago
by
Julian Labus
Committed by
David Bauer
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
make branch descriptions configurable
parent
b57a6509
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
app.css
+5
-0
5 additions, 0 deletions
app.css
app.js
+24
-0
24 additions, 0 deletions
app.js
config_template.js
+8
-0
8 additions, 0 deletions
config_template.js
index.html
+2
-15
2 additions, 15 deletions
index.html
with
39 additions
and
15 deletions
app.css
+
5
−
0
View file @
343c2cda
...
...
@@ -91,6 +91,11 @@ h1, h2, h3, h4, h5, h6 {
background
:
rgba
(
255
,
255
,
255
,
0.8
);
}
#branchName
{
text-transform
:
capitalize
;
font-weight
:
bold
;
}
#currentVersions
{
float
:
right
;
padding
:
.5em
;
...
...
This diff is collapsed.
Click to expand it.
app.js
+
24
−
0
View file @
343c2cda
...
...
@@ -832,6 +832,7 @@ var firmwarewizard = function() {
return
branches
.
indexOf
(
a
.
branch
)
>
branches
.
indexOf
(
b
.
branch
);
});
$
(
'
#branchdescs
'
).
innerHTML
=
''
;
$
(
'
#branchselect
'
).
innerHTML
=
''
;
$
(
'
#branch-experimental-dl
'
).
innerHTML
=
''
;
...
...
@@ -849,6 +850,29 @@ var firmwarewizard = function() {
(
rev
.
size
!==
''
?
'
[
'
+
rev
.
size
+
'
]
'
:
''
)
+
'
(
'
+
prettyPrintVersion
(
rev
.
version
)
+
'
)
'
;
if
(
rev
.
branch
in
config
.
branch_descriptions
)
{
var
li
=
document
.
createElement
(
'
li
'
);
var
name
=
document
.
createElement
(
'
span
'
);
name
.
innerText
=
rev
.
branch
;
name
.
id
=
'
branchName
'
;
var
desc
=
document
.
createElement
(
'
span
'
);
desc
.
id
=
'
branchDesc
'
desc
.
innerText
=
'
'
+
config
.
branch_descriptions
[
rev
.
branch
];
li
.
appendChild
(
name
);
if
(
rev
.
branch
==
config
.
recommended_branch
)
{
var
recommended
=
document
.
createElement
(
'
sup
'
);
recommended
.
innerText
=
'
Empfehlung
'
;
name
.
appendChild
(
recommended
);
}
br
=
document
.
createElement
(
'
br
'
);
li
.
appendChild
(
br
);
li
.
appendChild
(
desc
);
$
(
'
#branchdescs
'
).
appendChild
(
li
);
}
if
(
config
.
experimental_branches
.
indexOf
(
rev
.
branch
)
!=
-
1
)
{
if
(
$
(
'
#branchselect .dl-experimental
'
)
===
null
)
{
var
button
=
document
.
createElement
(
'
button
'
);
...
...
This diff is collapsed.
Click to expand it.
config_template.js
+
8
−
0
View file @
343c2cda
...
...
@@ -30,6 +30,14 @@ var config = {
'
./images/gluon-factory-example.html
'
:
'
stable
'
,
'
./images/gluon-sysupgrade-example.html
'
:
'
stable
'
},
// branch descriptions shown during selection
branch_descriptions
:
{
stable
:
'
Gut getestet, zuverlässig und stabil.
'
,
beta
:
'
Vorabtests neuer Stable-Kandidaten.
'
,
experimental
:
'
Ungetestet, automatisch generiert.
'
},
// recommended branch will be marked during selection
recommended_branch
:
'
stable
'
,
// experimental branches (show a warning for these branches)
experimental_branches
:
[
'
experimental
'
],
// path to preview pictures directory
...
...
This diff is collapsed.
Click to expand it.
index.html
+
2
−
15
View file @
343c2cda
...
...
@@ -57,20 +57,7 @@
<div
id=
"branch-pane"
class=
"pane initiallyhidden"
>
<h1>
Schritt 3: Wähle Deinen Update-Kanal
</h1>
<p>
Diese Freifunk-Firmware bieten wir in verschiedenen Versionen an:
</p>
<ul>
<li>
<strong>
Stable
<sup>
Empfehlung
</sup></strong><br
/>
Gut getestet, zuverl
ä
ssig und stabil.
<br
/>
</li>
<li>
<strong>
Beta
</strong><br
/>
Vorabtests neuer Stable-Kandidaten.
<br
/>
</li>
<li>
<strong>
Experimental
</strong><br
/>
Ungetestet, automatisch generiert.
<br
/>
</li>
</ul>
<ul
id=
"branchdescs"
></ul>
<p>
Die Auswahl der passenden Version entscheidet
ü
ber die
Stablit
ä
t des Routers und den potentiell anfallenden
Wartungsaufwand.
</p>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment