Skip to content

Commit

Permalink
added lang support for fix textes #2
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Rothenbücher committed Feb 6, 2017
1 parent 52b111c commit 39e780a
Show file tree
Hide file tree
Showing 8 changed files with 169 additions and 131 deletions.
29 changes: 13 additions & 16 deletions WebContent/WEB-INF/cron.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ import de.michaelkuerbis.presenter.utils.CastConnection;
html.div {
div( class:"container", id:"cron", style:"display:none;"){
div(class:"col-xs-12"){
div( class:"page-header"){ h1('add cronjobs') }
div( class:"page-header"){ h1('data-i18n':"cron_title",'add cronjobs') }
}
div(class:"col-xs-12"){
div(class:"form-horizontal"){

div( class:"form-group"){
label(class:"col-sm-2 control-label", "Description:")
label(class:"col-sm-2 control-label",'data-i18n':"cron_desc", "Description:")
div( class:"col-sm-10"){
input( type:"text",class:"form-control", id:"name", placeholder:"description")
input( type:"text",class:"form-control", id:"name",'data-i18n-placeholder':"cron_desc_placeholder", placeholder:"description")
}
}

div( class:"form-group"){
label(class:"col-sm-2 control-label", "Receiver:")
label(class:"col-sm-2 control-label",'data-i18n':"cron_receiver", "Receiver:")
div( class:"col-sm-10"){
select(id:"receiver-ip", class:"form-control"){
for(CastConnection con: SettingsServlet.getConnections()){
Expand All @@ -28,41 +28,38 @@ html.div {
}

div( class:"form-group"){
label(class:"col-sm-2 control-label", "Execution pattern:")
label(class:"col-sm-2 control-label",'data-i18n':"cron_pattern", "Execution pattern:")
div( class:"col-sm-10"){
input( type:"text",class:"form-control", id:"pattern", placeholder:"* * * * *")
input( type:"text",class:"form-control", id:"pattern",'data-i18n-placeholder':"cron_pattern_placeholder", placeholder:"* * * * *")
}
}

div( class:"form-group"){
label(class:"col-sm-2 control-label", "Url:")
label(class:"col-sm-2 control-label",'data-i18n':"cron_url", "Url:")
div( class:"col-sm-10"){
input( type:"text",class:"form-control", id:"url", placeholder:"http://www....")
input( type:"text",class:"form-control", id:"url",'data-i18n-placeholder':"cron_url_placeholder", placeholder:"http://www....")
}
}
div( class:"form-group"){
div( class:"col-sm-offset-2 col-sm-10"){
button( id:"add", class:"btn btn-default","add")
button( id:"add", class:"btn btn-default",'data-i18n':"cron_add","add")
}
}
}
div(class:"form-horizontal"){
div( class:"form-group"){
label(class:"col-sm-2 control-label", "Reload page after sec.")
label(class:"col-sm-2 control-label",'data-i18n':"cron_reload", "Reload page after sec.")
div( class:"col-sm-10"){
input( type:"number",class:"form-control", id:"refresh", min:"0", value:"0")
}
label(class:"col-sm-offset-2 col-sm-10 pull-left", "0 means no reload at all")
label(class:"col-sm-offset-2 col-sm-10 pull-left",'data-i18n':"cron_zero_reload", "0 means no reload at all")
}
}
button( id:"kill", style:"display: none",disabled:"disabled","Stop casting")
p( id:"post-note", style:"display: none",
"""If the page does not load please be sure HTTP header X-Frame-Options
allows the page to be loaded inside a frame not on the same origin.""")
}
div(class:"col-xs-12"){
div( class:"page-header"){
h1('current cronjobs'){
h1(class:"pull-left",'data-i18n':"cron_current_jobs",'current cronjobs')
div(style:"margin-left: 10px;padding-top: 20px;"){
button(class:"btn btn-default", id:"refreshjobs", style:"height: 34px;"){
span(class:"glyphicon glyphicon-refresh", " ")
}
Expand Down
35 changes: 18 additions & 17 deletions WebContent/WEB-INF/main.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ html.div {
div( class:"container", id:"main"){
div(class:"col-xs-12"){
div( class:"page-header"){
h1('data-i18n':"overview",'Overview') {
//TODO Modal dialog
h1(class:"pull-left",'data-i18n':"main_title",'Overview')
//TODO Modal dialog
div(style:"margin-left: 10px;padding-top: 20px;"){
button(class:"btn btn-default", 'data-toggle':"modal", 'data-target':"#addchromecast", "+")
button(class:"btn btn-default", id:"refreshall", style:"height: 34px;"){
span(class:"glyphicon glyphicon-refresh", " ")
Expand All @@ -15,14 +16,14 @@ html.div {
span(class:"glyphicon glyphicon-search", " ")
}
}

}
}

if(SettingsServlet.getConnections().size() == 0){
div(class:"col-xs-12 alert alert-warning"){
p("There are no chromecasts defined."){
a(href:"#",'data-toggle':"modal", 'data-target':"#addchromecast", "add one.")
}
div(class:"pull-left",'data-i18n':"main_no_casts","There are no chromecasts defined.")
a(href:"#",'data-toggle':"modal", 'data-target':"#addchromecast",'data-i18n':"main_no_casts_add_one", "add one.")
}
}else{
for(CastConnection con: SettingsServlet.getConnections()){
Expand All @@ -42,9 +43,9 @@ html.div {
div(class:"panel-body"){
p("IP: "+con.getIp())
div{
p("Status: ")
p('data-i18n':"main_panel_status","Status: ")
p(class:"status")
p("App:")
p('data-i18n':"main_panel_app","App:")
p(class:"application")
div(class:"btn-group toogle-option", 'data-toggle':"buttons"){
a(href:"#",class:"btn btn-primary option-default "+(con.isDefault()?"active":""),'data-ip':con.getIp(),"default"){
Expand All @@ -64,10 +65,10 @@ html.div {
}
}
div(class:"alert alert-warning trashmsg", style:"display:none;"){
p(class:"text-center", "Remove this chromecast?")
p(class:"text-center",'data-i18n':"main_panel_remove", "Remove this chromecast?")
p(class:"text-center"){
a(href:"#", class:"btn btn-danger yestrash",'data-ip':con.getIp(), "yes")
a(href:"#", class:"btn btn-default notrash", "no")
a(href:"#", class:"btn btn-danger yestrash",'data-i18n':"main_panel_remove_yes",'data-ip':con.getIp(), "yes")
a(href:"#", class:"btn btn-default notrash",'data-i18n':"main_panel_remove_no", "no")
}
}
}
Expand All @@ -83,26 +84,26 @@ html.div {
button( type:"button", class:"close", 'data-dismiss':"modal", 'aria-label':"Close"){
span( 'aria-hidden':"true", "x")
}
h4( class:"modal-title", id:"myModalLabel", "Add Chromecast")
h4( class:"modal-title", id:"myModalLabel",'data-i18n':"main_add_title", "Add Chromecast")
}
div (class:"modal-body"){
div(class:"form-horizontal"){
div( class:"form-group"){
label(class:"col-sm-2 control-label", "Name:")
label(class:"col-sm-2 control-label",'data-i18n':"main_add_name", "Name:")
div( class:"col-sm-10"){
input( type:"text",class:"form-control", id:"addname", placeholder:"Chromecast #1")
input( type:"text",class:"form-control", id:"addname",'data-i18n-placeholder':"main_add_name_placeholder", placeholder:"Chromecast #1")
}
}
div( class:"form-group"){
label(class:"col-sm-2 control-label", "Ip:")
label(class:"col-sm-2 control-label",'data-i18n':"main_add_ip", "Ip:")
div( class:"col-sm-10"){
input( type:"text",class:"form-control", id:"addip", placeholder:"127.0.0.1")
input( type:"text",class:"form-control", id:"addip",'data-i18n-placeholder':"main_add_ip_placeholder", placeholder:"127.0.0.1")
}
}
}
}
div (class:"modal-footer"){
button( type:"button", id:"addcastbutton", class:"btn btn-primary", "add Chromecast")
button( type:"button", id:"addcastbutton", class:"btn btn-primary",'data-i18n':"main_add_button", "add Chromecast")
}
}
}
Expand All @@ -114,7 +115,7 @@ html.div {
button( type:"button", class:"close", 'data-dismiss':"modal", 'aria-label':"Close"){
span( 'aria-hidden':"true", "x")
}
h4( class:"modal-title", id:"myModalLabel", "discovered Chromecasts")
h4( class:"modal-title", id:"myModalLabel",'data-i18n':"main_discover_title", "discovered Chromecasts")
}
div (class:"modal-body"){ h1("fooo") }
}
Expand Down
20 changes: 8 additions & 12 deletions WebContent/WEB-INF/sender.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,51 +4,47 @@ import de.michaelkuerbis.presenter.utils.CastConnection;
html.div {
div( class:"container", id:"sender", style:"display:none;"){
div(class:"col-xs-12"){
div( class:"page-header"){ h1('start cast') }
div( class:"page-header"){ h1('data-i18n':"sender_title",'start cast') }
}
div(class:"col-xs-12"){
div(class:"form-horizontal"){

div( class:"form-group"){
label(class:"col-sm-2 control-label", "Receiver:")
label(class:"col-sm-2 control-label",'data-i18n':"sender_receiver", "Receiver:")
div( class:"col-sm-10"){
select(id:"receiver-ip", class:"form-control"){
for(CastConnection con: SettingsServlet.getConnections()){
option(value:con.getIp(),"data-default":con.isDefault,con.getName())
}
}
}
label(class:"col-sm-2 control-label", "All (cast with default property):")
label(class:"col-sm-2 control-label",'data-i18n':"sender_all", "All (cast with default property):")
div( class:"col-sm-10"){
input( type:"checkbox",class:"form-control", id:"all")
}
}

div( class:"form-group"){
label(class:"col-sm-2 control-label", "Url:")
label(class:"col-sm-2 control-label",'data-i18n':"sender_url", "Url:")
div( class:"col-sm-10"){
input( type:"text",class:"form-control", id:"url", placeholder:"http://www....")
input( type:"text",class:"form-control", id:"url",'data-i18n-placeholder':"sender_url_placeholder", placeholder:"http://www....")
}
}
div( class:"form-group"){
div( class:"col-sm-offset-2 col-sm-10"){
button( id:"launch", class:"btn btn-default","launch")
button( id:"launch", class:"btn btn-default",'data-i18n':"sender_launch","launch")
}
}
}
div(class:"form-horizontal"){
div( class:"form-group"){
label(class:"col-sm-2 control-label", "Reload page after sec.")
label(class:"col-sm-2 control-label",'data-i18n':"sender_reload", "Reload page after sec.")
div( class:"col-sm-10"){
input( type:"number",class:"form-control", id:"refresh", min:"0", value:"0")
}
label(class:"col-sm-offset-2 col-sm-10 pull-left", "0 means no reload at all")
label(class:"col-sm-offset-2 col-sm-10 pull-left",'data-i18n':"sender_zero_reload", "0 means no reload at all")
}
}
button( id:"kill", style:"display: none",disabled:"disabled","Stop casting")
p( id:"post-note", style:"display: none",
"""If the page does not load please be sure HTTP header X-Frame-Options
allows the page to be loaded inside a frame not on the same origin.""")
}
}
script(src:"assets/js/sender.js")
Expand Down
11 changes: 7 additions & 4 deletions WebContent/assets/js/lang.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,14 @@
set_locale_to(url('?locale'));
});
console.log('lang download done!');
init();
init('body');
});

function init() {
$('body').i18n();
function init(selector) {
$(selector).i18n();
$(selector).find("[data-i18n-placeholder]").each(function(){
$(this).attr('placeholder', $.i18n($(this).data('i18n-placeholder')));
});
console.log('lang init done!');
}

Expand All @@ -28,7 +31,7 @@
$this = $(this);
console.log("change lang to: "+$this.val());
History.pushState(null, null, "?locale=" + $this.val());
init();
init('body');
});
});
})();
109 changes: 35 additions & 74 deletions WebContent/assets/js/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,82 +226,43 @@
requestEach();
});

$('#searchcasts')
.click(
function(ev) {
// ev.preventDefault();
$('#searchcasts').click(function(ev) {
// ev.preventDefault();

$
.ajax({
type: "GET",
url: "rest/discovered/get",
beforeSend: function() {
$(
'#discoverchromecast')
.find(
'.modal-body')
.html(
"");
}
})
.done(
function(data,
textStatus,
jqXHR) {
var obj = JSON
.parse(data);
$
.each(
obj,
function(
i,
elem) {
console
.log(elem);
var row = '<div class="row"><div class="col-xs-12">';
row += '<button class="btn btn-default discover-add" data-name="' +
elem.name +
'" data-ip="' +
elem.ip +
'">add ' +
elem.name +
" " +
elem.ip +
'</button>';
row += "</div></div>"
$(
'#discoverchromecast')
.find(
'.modal-body')
.append(
row);
});
$('.discover-add')
.click(
function(
ev) {
ev
.preventDefault();
addCast(
$(
this)
.data(
"ip"),
$(
this)
.data(
"name"));
});
})
.fail(
function(jqXHR,
textStatus,
errorThrown) {
// TODO error
console
.log("error");
});
$.ajax({
type: "GET",
url: "rest/discovered/get",
beforeSend: function() {
$('#discoverchromecast').find('.modal-body').html("");
}
}).done(function(data, textStatus, jqXHR) {
var obj = JSON.parse(data);
$.each(obj, function(i, elem) {
console.log(elem);
var row = '<div class="row"><div class="col-xs-12">';
row += '<button class="btn btn-default discover-add" data-name="' +
elem.name +
'" data-ip="' +
elem.ip +
'">'+$.i18n( 'main_discover_add' )+' ' +
elem.name +
" " +
elem.ip +
'</button>';
row += "</div></div>"
$('#discoverchromecast').find('.modal-body').append(row);
});
$('.discover-add').click(function(ev) {
ev.preventDefault();
addCast($(this).data("ip"),
$(this).data("name"));
});
})
.fail(function(jqXHR, textStatus, errorThrown) {
// TODO error
consolelog("error");
});
});

$('#senderbutton').click(function(ev) {
ev.preventDefault();
Expand Down
Loading

0 comments on commit 39e780a

Please sign in to comment.