Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
duniter-ui
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
nodes
typescript
modules
duniter-ui
Commits
b7894dfc
Commit
b7894dfc
authored
8 years ago
by
Cédric Moreau
Browse files
Options
Downloads
Patches
Plain Diff
[fix] Overview's labels translation was broken
parent
f4508db3
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/views/main/home/tabs/overview.jade
+4
-4
4 additions, 4 deletions
app/views/main/home/tabs/overview.jade
public/templates.js
+1
-1
1 addition, 1 deletion
public/templates.js
with
5 additions
and
5 deletions
app/views/main/home/tabs/overview.jade
+
4
−
4
View file @
b7894dfc
...
...
@@ -62,7 +62,7 @@
.card-title
span {{ current_number }}
.card-action
p {{ 'home.current
_
number' | translate }}
p {{ 'home.current
.
number' | translate }}
.col.s6.m3
.card
...
...
@@ -71,7 +71,7 @@
.card-title
span {{ current_membersCount }}
.card-action
p {{ 'home.current
_
membersCount' | translate }}
p {{ 'home.current
.
membersCount' | translate }}
.col.s6.m3
.card.card-time
...
...
@@ -81,7 +81,7 @@
p {{ current_medianTime | mt_date }}
p {{ current_medianTime | mt_time }}
.card-action
p {{ 'home.current
_
medianTime' | translate }}
p {{ 'home.current
.
medianTime' | translate }}
.col.s6.m3
.card
...
...
@@ -90,7 +90,7 @@
.card-title
span {{ current_powMin }}
.card-action
p {{ 'home.current
_
powMin' | translate }}
p {{ 'home.current
.
powMin' | translate }}
.col.s6.m3
.card
...
...
This diff is collapsed.
Click to expand it.
public/templates.js
+
1
−
1
View file @
b7894dfc
...
...
@@ -515,7 +515,7 @@ var buf = [];
var
jade_mixins
=
{};
var
jade_interp
;
buf
.
push
(
"
<div class=
\"
container
\"
><div ng-show=
\"
should_reconfigure
\"
class=
\"
row
\"
><div class=
\"
card network-alert
\"
><blockquote class=
\"
card-content left-align
\"
><div class=
\"
center
\"
><i class=
\"
fa fa-globe fa-5x
\"
></i><h6 translate=
\"
configuration.create_network.title
\"
class=
\"
card-title
\"
></h6></div><div class=
\"
left-align
\"
><p>{{ 'home.tabs.overview.should_reconfigure' | translate }}</p></div><div ng-if=
\"
!reconfiguring
\"
class=
\"
center
\"
><button ng-click=
\"
reconfigure_network()
\"
class=
\"
btn-large waves-effect waves-light
\"
><i class=
\"
left fa fa-magic
\"
></i><span translate=
\"
configuration.create_network.button.autoconf
\"
></span></button></div><div ng-if=
\"
reconfiguring
\"
class=
\"
center
\"
><div class=
\"
preloader-wrapper active
\"
><div class=
\"
spinner-layer spinner-blue-only
\"
><div class=
\"
circle-clipper left
\"
><div class=
\"
circle
\"
></div></div></div></div></div></blockquote></div></div><div class=
\"
row
\"
><div class=
\"
col s12
\"
><div class=
\"
card-panel currency
\"
><h1>{{ current_currency }}</h1></div></div></div><div class=
\"
row home
\"
><div class=
\"
col s6 m3
\"
><div class=
\"
card sync
\"
><div class=
\"
card-content
\"
><div ng-show=
\"
is_pulling
\"
class=
\"
card-title
\"
><p>{{ 'home.pulling.network' | translate }} {{ network_percent }}%</p><div class=
\"
progress
\"
><div style=
\"
width: {{ network_percent }}%
\"
class=
\"
determinate
\"
></div></div><p>{{ 'home.pulling.peer' | translate }} {{ peer_percent }}%</p><div class=
\"
progress
\"
><div style=
\"
width: {{ peer_percent }}%
\"
class=
\"
determinate
\"
></div></div></div><div ng-show=
\"
has_pulled && !is_pulling
\"
class=
\"
iconic card-title
\"
><i class=
\"
green-text material-icons
\"
>done</i></div><div ng-show=
\"
!has_pulled && !is_pulling
\"
class=
\"
iconic card-title
\"
><i class=
\"
grey-text material-icons
\"
>schedule</i></div></div><div class=
\"
card-action
\"
><p ng-show=
\"
!is_pulling
\"
>{{ sync_state | translate }} {{ sync_time }}</p><p ng-show=
\"
is_pulling
\"
>{{ sync_state | translate }}</p></div></div></div><div class=
\"
col s6 m3
\"
><div id=
\"
server_state
\"
class=
\"
card
\"
><div class=
\"
card-content
\"
><div class=
\"
card-title
\"
><i ng-if=
\"
server_stopped
\"
class=
\"
red-text material-icons
\"
>stop</i><i ng-if=
\"
server_started
\"
class=
\"
green-text material-icons
\"
>play_arrow</i><div ng-if=
\"
!server_started && !server_stopped
\"
class=
\"
preloader-wrapper active
\"
><div class=
\"
spinner-layer spinner-blue-only
\"
><div class=
\"
circle-clipper left
\"
><div class=
\"
circle
\"
></div></div></div></div></div></div><div class=
\"
card-action
\"
><p>{{ 'home.state' | translate }} <span ng-if=
\"
server_started
\"
class=
\"
green-text
\"
>{{ 'home.state.started' | translate }}</span><span ng-if=
\"
server_stopped
\"
class=
\"
red-text
\"
>{{ 'home.state.stopped' | translate }}</span><span ng-if=
\"
!server_started && !server_stopped
\"
class=
\"
blue-text
\"
>...</span></p></div></div></div><div class=
\"
col s6 m3
\"
><div class=
\"
card
\"
><div class=
\"
card-content
\"
><i class=
\"
fa fa-chain fa-5x
\"
></i><div class=
\"
card-title
\"
><span>{{ current_number }}</span></div></div><div class=
\"
card-action
\"
><p>{{ 'home.current
_
number' | translate }}</p></div></div></div><div class=
\"
col s6 m3
\"
><div class=
\"
card
\"
><div class=
\"
card-content
\"
><i class=
\"
fa fa-users fa-5x
\"
></i><div class=
\"
card-title
\"
><span>{{ current_membersCount }}</span></div></div><div class=
\"
card-action
\"
><p>{{ 'home.current
_
membersCount' | translate }}</p></div></div></div><div class=
\"
col s6 m3
\"
><div class=
\"
card card-time
\"
><div class=
\"
card-content
\"
><i class=
\"
fa fa-hourglass-half fa-5x
\"
></i><div class=
\"
card-title
\"
><p>{{ current_medianTime | mt_date }}</p><p>{{ current_medianTime | mt_time }}</p></div></div><div class=
\"
card-action
\"
><p>{{ 'home.current
_
medianTime' | translate }}</p></div></div></div><div class=
\"
col s6 m3
\"
><div class=
\"
card
\"
><div class=
\"
card-content
\"
><i class=
\"
fa fa-graduation-cap fa-5x
\"
></i><div class=
\"
card-title
\"
><span>{{ current_powMin }}</span></div></div><div class=
\"
card-action
\"
><p>{{ 'home.current
_
powMin' | translate }}</p></div></div></div><div class=
\"
col s6 m3
\"
><div class=
\"
card
\"
><div class=
\"
card-content
\"
><i class=
\"
fa fa-money fa-5x
\"
></i><div class=
\"
card-title
\"
><span>{{ monetaryMass }} UD</span></div></div><div class=
\"
card-action
\"
><p>{{ 'home.current.mmass' | translate }}</p></div></div></div><div class=
\"
col s6 m3
\"
><div class=
\"
card proof-card
\"
><div class=
\"
card-content
\"
><i class=
\"
fa fa-dashboard fa-5x
\"
></i><div class=
\"
card-title
\"
><span class=
\"
proof-mesure
\"
>{{ pow_total }}</span><span class=
\"
proof-unit
\"
>{{ 'home.pow.unit' | translate }}</span></div></div><div class=
\"
card-action
\"
><div ng-show=
\"
!pow_waiting && lastNearPoW
\"
><p class=
\"
hash
\"
><span>{{ lastNearPoW.slice(0,8) }}</span><div class=
\"
progress
\"
><div class=
\"
indeterminate
\"
></div></div></p></div><div ng-show=
\"
pow_mirror
\"
><p><span>{{ 'home.pow.is_mirror' | translate }}</span></p></div><div ng-show=
\"
!pow_mirror && pow_waiting
\"
><p><span>{{ 'home.pow.is_waiting' | translate }}</span></p></div></div></div></div></div></div>
"
);;
return
buf
.
join
(
""
);
buf
.
push
(
"
<div class=
\"
container
\"
><div ng-show=
\"
should_reconfigure
\"
class=
\"
row
\"
><div class=
\"
card network-alert
\"
><blockquote class=
\"
card-content left-align
\"
><div class=
\"
center
\"
><i class=
\"
fa fa-globe fa-5x
\"
></i><h6 translate=
\"
configuration.create_network.title
\"
class=
\"
card-title
\"
></h6></div><div class=
\"
left-align
\"
><p>{{ 'home.tabs.overview.should_reconfigure' | translate }}</p></div><div ng-if=
\"
!reconfiguring
\"
class=
\"
center
\"
><button ng-click=
\"
reconfigure_network()
\"
class=
\"
btn-large waves-effect waves-light
\"
><i class=
\"
left fa fa-magic
\"
></i><span translate=
\"
configuration.create_network.button.autoconf
\"
></span></button></div><div ng-if=
\"
reconfiguring
\"
class=
\"
center
\"
><div class=
\"
preloader-wrapper active
\"
><div class=
\"
spinner-layer spinner-blue-only
\"
><div class=
\"
circle-clipper left
\"
><div class=
\"
circle
\"
></div></div></div></div></div></blockquote></div></div><div class=
\"
row
\"
><div class=
\"
col s12
\"
><div class=
\"
card-panel currency
\"
><h1>{{ current_currency }}</h1></div></div></div><div class=
\"
row home
\"
><div class=
\"
col s6 m3
\"
><div class=
\"
card sync
\"
><div class=
\"
card-content
\"
><div ng-show=
\"
is_pulling
\"
class=
\"
card-title
\"
><p>{{ 'home.pulling.network' | translate }} {{ network_percent }}%</p><div class=
\"
progress
\"
><div style=
\"
width: {{ network_percent }}%
\"
class=
\"
determinate
\"
></div></div><p>{{ 'home.pulling.peer' | translate }} {{ peer_percent }}%</p><div class=
\"
progress
\"
><div style=
\"
width: {{ peer_percent }}%
\"
class=
\"
determinate
\"
></div></div></div><div ng-show=
\"
has_pulled && !is_pulling
\"
class=
\"
iconic card-title
\"
><i class=
\"
green-text material-icons
\"
>done</i></div><div ng-show=
\"
!has_pulled && !is_pulling
\"
class=
\"
iconic card-title
\"
><i class=
\"
grey-text material-icons
\"
>schedule</i></div></div><div class=
\"
card-action
\"
><p ng-show=
\"
!is_pulling
\"
>{{ sync_state | translate }} {{ sync_time }}</p><p ng-show=
\"
is_pulling
\"
>{{ sync_state | translate }}</p></div></div></div><div class=
\"
col s6 m3
\"
><div id=
\"
server_state
\"
class=
\"
card
\"
><div class=
\"
card-content
\"
><div class=
\"
card-title
\"
><i ng-if=
\"
server_stopped
\"
class=
\"
red-text material-icons
\"
>stop</i><i ng-if=
\"
server_started
\"
class=
\"
green-text material-icons
\"
>play_arrow</i><div ng-if=
\"
!server_started && !server_stopped
\"
class=
\"
preloader-wrapper active
\"
><div class=
\"
spinner-layer spinner-blue-only
\"
><div class=
\"
circle-clipper left
\"
><div class=
\"
circle
\"
></div></div></div></div></div></div><div class=
\"
card-action
\"
><p>{{ 'home.state' | translate }} <span ng-if=
\"
server_started
\"
class=
\"
green-text
\"
>{{ 'home.state.started' | translate }}</span><span ng-if=
\"
server_stopped
\"
class=
\"
red-text
\"
>{{ 'home.state.stopped' | translate }}</span><span ng-if=
\"
!server_started && !server_stopped
\"
class=
\"
blue-text
\"
>...</span></p></div></div></div><div class=
\"
col s6 m3
\"
><div class=
\"
card
\"
><div class=
\"
card-content
\"
><i class=
\"
fa fa-chain fa-5x
\"
></i><div class=
\"
card-title
\"
><span>{{ current_number }}</span></div></div><div class=
\"
card-action
\"
><p>{{ 'home.current
.
number' | translate }}</p></div></div></div><div class=
\"
col s6 m3
\"
><div class=
\"
card
\"
><div class=
\"
card-content
\"
><i class=
\"
fa fa-users fa-5x
\"
></i><div class=
\"
card-title
\"
><span>{{ current_membersCount }}</span></div></div><div class=
\"
card-action
\"
><p>{{ 'home.current
.
membersCount' | translate }}</p></div></div></div><div class=
\"
col s6 m3
\"
><div class=
\"
card card-time
\"
><div class=
\"
card-content
\"
><i class=
\"
fa fa-hourglass-half fa-5x
\"
></i><div class=
\"
card-title
\"
><p>{{ current_medianTime | mt_date }}</p><p>{{ current_medianTime | mt_time }}</p></div></div><div class=
\"
card-action
\"
><p>{{ 'home.current
.
medianTime' | translate }}</p></div></div></div><div class=
\"
col s6 m3
\"
><div class=
\"
card
\"
><div class=
\"
card-content
\"
><i class=
\"
fa fa-graduation-cap fa-5x
\"
></i><div class=
\"
card-title
\"
><span>{{ current_powMin }}</span></div></div><div class=
\"
card-action
\"
><p>{{ 'home.current
.
powMin' | translate }}</p></div></div></div><div class=
\"
col s6 m3
\"
><div class=
\"
card
\"
><div class=
\"
card-content
\"
><i class=
\"
fa fa-money fa-5x
\"
></i><div class=
\"
card-title
\"
><span>{{ monetaryMass }} UD</span></div></div><div class=
\"
card-action
\"
><p>{{ 'home.current.mmass' | translate }}</p></div></div></div><div class=
\"
col s6 m3
\"
><div class=
\"
card proof-card
\"
><div class=
\"
card-content
\"
><i class=
\"
fa fa-dashboard fa-5x
\"
></i><div class=
\"
card-title
\"
><span class=
\"
proof-mesure
\"
>{{ pow_total }}</span><span class=
\"
proof-unit
\"
>{{ 'home.pow.unit' | translate }}</span></div></div><div class=
\"
card-action
\"
><div ng-show=
\"
!pow_waiting && lastNearPoW
\"
><p class=
\"
hash
\"
><span>{{ lastNearPoW.slice(0,8) }}</span><div class=
\"
progress
\"
><div class=
\"
indeterminate
\"
></div></div></p></div><div ng-show=
\"
pow_mirror
\"
><p><span>{{ 'home.pow.is_mirror' | translate }}</span></p></div><div ng-show=
\"
!pow_mirror && pow_waiting
\"
><p><span>{{ 'home.pow.is_waiting' | translate }}</span></p></div></div></div></div></div></div>
"
);;
return
buf
.
join
(
""
);
};
if
(
typeof
define
===
'
function
'
&&
define
.
amd
)
{
define
([],
function
()
{
...
...
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