[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-514-gf1893ee
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-514-gf1893ee
|
From: GetAway <tux...@ne...> - 2015-04-06 09:38:11
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via f1893ee678aa2681a2afe6f7f6b105192a53092c (commit)
from b25ee36f893e863e077515f33b516c960d1baaa1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f1893ee678aa2681a2afe6f7f6b105192a53092c
Author: svenhoefer <sve...@sv...>
Date: Mon Apr 6 11:37:20 2015 +0200
yWeb: use neutrino_blocks to prevent duplicate code
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_buttons.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_buttons.yhtm
index bd86735..38d9fab 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_buttons.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_buttons.yhtm
@@ -368,9 +368,7 @@ function do_submit()
</table>
<br />
<input type="hidden" name="execute" value="include-block:Y_Blocks.txt;buttons_save_settings;nix" />
- <button type="button" ytype="save" title="{=L:0014=}" onclick="do_submit()">{=L:0021=}</button>
- <button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">{=L:1000=}</button>
- <a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:0046=}</a>
+ {=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
</form>
</div>
</div>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_lcd.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_lcd.yhtm
index db388ae..87a12f7 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_lcd.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_lcd.yhtm
@@ -168,9 +168,7 @@ function do_submit()
</table>
<br />
<input type="hidden" name="execute" value="include-block:Y_Blocks.txt;lcd_save_settings;nix" />
- <button type="button" ytype="save" title="{=L:0014=}" onclick="do_submit()">{=L:0021=}</button>
- <button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">{=L:1000=}</button>
- <a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:0046=}</a>
+ {=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
</form>
</div>
</div>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_personalize.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_personalize.yhtm
index bf0f174..0388bf9 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_personalize.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_personalize.yhtm
@@ -362,9 +362,7 @@ function do_init()
</table>
<br />
<input type="hidden" name="execute" value="include-block:Y_Blocks.txt;personalize_save_settings;nix"/>
- <button type="button" ytype="save" title="{=L:0014=}" onclick="do_submit()">{=L:0021=}</button>
- <button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">{=L:1000=}</button>
- <a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:0046=}</a>
+ {=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
</form>
</div>
</div>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_video_audio.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_video_audio.yhtm
index 3f036fb..502d89b 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_video_audio.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_video_audio.yhtm
@@ -189,9 +189,7 @@ function do_submit()
</table>
<br/>
<input type="hidden" name="execute" value="include-block:Y_Blocks.txt;video_audio_save_settings;nix"/>
- <button type="button" ytype="save" title="{=L:0014=}" onclick="do_submit()">{=L:0021=}</button>
- <button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">{=L:1000=}</button>
- <a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:0046=}</a> (*) {=L:0033=}
+ {=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
</form>
</div>
</div>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index acd9de2..0c6871f 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.8.1.2
-date=05.04.2015
+version=2.8.1.3
+date=06.04.2015
type=Release
info=Tuxbox
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_neutrino_Blocks.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_neutrino_Blocks.txt
index aa113e2..3da3992 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_neutrino_Blocks.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_neutrino_Blocks.txt
@@ -40,6 +40,13 @@ start-block~neutrino_form_helpbox
</div>
end-block~neutrino_form_helpbox
+# ------- Neutrino form submit buttons
+start-block~neutrino_form_submit
+ <button type="button" ytype="save" title="{=L:0014=}" onclick="do_submit()">{=L:0021=}</button>
+ <button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">{=L:1000=}</button>
+ <a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:0046=}</a>
+end-block~neutrino_form_submit
+
# ------- Neutrino form-data: record -------------------------------
start-block~neutrino_form-data_record
<div class="work_box">
@@ -172,9 +179,7 @@ start-block~neutrino_form-data_record
<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_record_save_settings;nix"/>
<input type="hidden" name="form" value="{=form=}"/>
- <button type="button" ytype="save" title="{=L:0014=}" onclick="do_submit()">{=L:0021=}</button>
- <button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">{=L:1000=}</button>
- <a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:0046=}</a>
+ {=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
</form>
</div>
</div>
@@ -439,9 +444,7 @@ start-block~neutrino_form-data_movieplayer
<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_movieplayer_save_settings;nix"/>
<input type="hidden" name="form" value="{=form=}"/>
- <button type="button" ytype="save" title="{=L:0014=}" onclick="do_submit()">{=L:0021=}</button>
- <button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">{=L:1000=}</button>
- <a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:0046=}</a>
+ {=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
</form>
</div>
</div>
@@ -599,9 +602,7 @@ start-block~neutrino_form-data_parental
<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_parental_save_settings;nix"/>
<input type="hidden" name="form" value="{=form=}"/>
- <button type="button" ytype="save" title="{=L:0014=}" onclick="do_submit()">{=L:0021=}</button>
- <button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">{=L:1000=}</button>
- <a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:0046=}</a>
+ {=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
</form>
</div>
</div>
@@ -910,9 +911,7 @@ start-block~neutrino_form-data_diverse
<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_diverse_save_settings;nix"/>
<input type="hidden" name="form" value="{=form=}"/>
- <button type="button" ytype="save" title="{=L:0014=}" onclick="do_submit()">{=L:0021=}</button>
- <button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">{=L:1000=}</button>
- <a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:0046=}</a>
+ {=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
</form>
</div>
</div>
@@ -1116,9 +1115,7 @@ start-block~neutrino_form-data_bootoptions
<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_bootoptions_save_settings;nix"/>
<input type="hidden" name="form" value="{=form=}"/>
- <button type="button" ytype="save" title="{=L:0014=}" onclick="do_submit()">{=L:0021=}</button>
- <button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">{=L:1000=}</button>
- <a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:0046=}</a>
+ {=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
</form>
</div>
</div>
@@ -1212,9 +1209,7 @@ start-block~neutrino_form-data_pictureviewer
<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_pictureviewer_save_settings;nix"/>
<input type="hidden" name="form" value="{=form=}"/>
- <button type="button" ytype="save" title="{=L:0014=}" onclick="do_submit()">{=L:0021=}</button>
- <button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">{=L:1000=}</button>
- <a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:0046=}</a>
+ {=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
</form>
</div>
</div>
@@ -1319,9 +1314,7 @@ start-block~neutrino_form-data_audioplayer
<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_audioplayer_save_settings;nix"/>
<input type="hidden" name="form" value="{=form=}"/>
- <button type="button" ytype="save" title="{=L:0014=}" onclick="do_submit()">{=L:0021=}</button>
- <button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">{=L:1000=}</button>
- <a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:0046=}</a>
+ {=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
</form>
</div>
</div>
@@ -1611,9 +1604,7 @@ start-block~neutrino_form-data_direct_recording
<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_direct_recording_save_settings;nix"/>
<input type="hidden" name="form" value="{=form=}"/>
- <button type="button" ytype="save" title="{=L:0014=}" onclick="do_submit()">{=L:0021=}</button>
- <button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">{=L:1000=}</button>
- <a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:0046=}</a>
+ {=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
</form>
</div>
</div>
@@ -1707,9 +1698,7 @@ start-block~neutrino_form-data_esound
<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_esound_save_settings;nix"/>
<input type="hidden" name="form" value="{=form=}"/>
- <button type="button" ytype="save" title="{=L:0014=}" onclick="do_submit()">{=L:0021=}</button>
- <button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">{=L:1000=}</button>
- <a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:0046=}</a>
+ {=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
</form>
</div>
</div>
-----------------------------------------------------------------------
Summary of changes:
.../daemons/nhttpd/web/Y_Settings_buttons.yhtm | 4 +-
.../daemons/nhttpd/web/Y_Settings_lcd.yhtm | 4 +-
.../daemons/nhttpd/web/Y_Settings_personalize.yhtm | 4 +-
.../daemons/nhttpd/web/Y_Settings_video_audio.yhtm | 4 +-
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 4 +-
.../daemons/nhttpd/web/Y_neutrino_Blocks.txt | 43 +++++++------------
6 files changed, 22 insertions(+), 41 deletions(-)
--
Tuxbox-GIT: apps
|
