diff options
-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | pages/pageelems.ecpp | 4 | ||||
-rw-r--r-- | pages/setup.ecpp | 2 |
3 files changed, 4 insertions, 3 deletions
@@ -154,6 +154,7 @@ $(VERSIONSUFFIX): FORCE libvdr-$(PLUGIN).so: $(VERSIONSUFFIX) $(SUBDIRS) $(PLUGINOBJS) $(CXX) $(LDFLAGS) -shared -o $@ $(PLUGINOBJS) -Wl,--whole-archive $(WEBLIBS) -Wl,--no-whole-archive $(LIBS) @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) + ifneq ($(TNTVERS7),yes) @echo "" @echo "If LIVE was built successfully and you can try to use it!" diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp index 87ca604..4961b08 100644 --- a/pages/pageelems.ecpp +++ b/pages/pageelems.ecpp @@ -63,7 +63,7 @@ int update_status(1); <%def hide_element> <%args> - bool hide = true; + int hide = 1; </%args> <%cpp> if (hide) { </%cpp>style="visibility: hidden"<%cpp> } </%cpp> </%def> @@ -95,7 +95,7 @@ int update_status(1); string alt; string id; </%args> -<%cpp> { </%cpp> <a <%cpp> if (!id.empty()) { </%cpp> id="<$ id $>" <%cpp> } </%cpp><& hide_element hide=(!id.empty()) &> href="vdr_request/<$ action $>?param=<$ param $>" <%cpp>if (!tip.empty()) { </%cpp><& tooltip.hint text=(tip) &> <%cpp> } </%cpp>><img src="<$ LiveSetup().GetThemedLink("img", image) $>" alt="<$ alt $>"></img></a> <%cpp> } </%cpp> +<%cpp> { </%cpp> <a <%cpp> if (!id.empty()) { </%cpp> id="<$ id $>" <%cpp> } </%cpp><& hide_element hide=(id.empty()? 0 : 1) &> href="vdr_request/<$ action $>?param=<$ param $>" <%cpp>if (!tip.empty()) { </%cpp><& tooltip.hint text=(tip) &> <%cpp> } </%cpp>><img src="<$ LiveSetup().GetThemedLink("img", image) $>" alt="<$ alt $>"></img></a> <%cpp> } </%cpp> </%def> <# ---------------------------------------------------------------------- #> diff --git a/pages/setup.ecpp b/pages/setup.ecpp index d5d4f2a..7279ad0 100644 --- a/pages/setup.ecpp +++ b/pages/setup.ecpp @@ -210,7 +210,7 @@ if (!cUser::CurrentUserHasRightTo(UR_EDITSETUP)) <option value="PES" <%cpp> SELECTIF(streamdevtype == "PES") </%cpp>>PES</option> <option value="PS" <%cpp> SELECTIF(streamdevtype == "PS") </%cpp>>PS</option> <option value="ES" <%cpp> SELECTIF(streamdevtype == "ES") </%cpp>>ES</option> - <option value="Extern" <%cpp> SELECTIF(streamdevtype == "Extern") </%cpp>>Extern</option> + <option value="EXT" <%cpp> SELECTIF(streamdevtype == "EXT") </%cpp>>Extern</option> </select></td> </tr> </table> |