diff options
14 files changed, 37 insertions, 37 deletions
diff --git a/applications/luci-asterisk/luasrc/view/asterisk/dialzones.htm b/applications/luci-asterisk/luasrc/view/asterisk/dialzones.htm index 2f7ed420e4..f93496df8b 100644 --- a/applications/luci-asterisk/luasrc/view/asterisk/dialzones.htm +++ b/applications/luci-asterisk/luasrc/view/asterisk/dialzones.htm @@ -98,7 +98,7 @@ $Id$ </td> <td style="text-align:right" class="cbi-value-field"> <% for _ in ipairs(rule.matches) do %> - <%=rule.addprefix and digit_pattern(rule.addprefix)%> <br /> + <%=rule.addprefix and digit_pattern(rule.addprefix)%> <br /> <% end %> </td> <td style="text-align:left" class="cbi-value-field"> diff --git a/applications/luci-olsr-viz/htdocs/cgi-bin/olsr-viz.sh b/applications/luci-olsr-viz/htdocs/cgi-bin/olsr-viz.sh index 86cb87ca67..e33c632465 100755 --- a/applications/luci-olsr-viz/htdocs/cgi-bin/olsr-viz.sh +++ b/applications/luci-olsr-viz/htdocs/cgi-bin/olsr-viz.sh @@ -21,12 +21,12 @@ STYLE="width: 100%; height: 93%; border: 1px solid #ccc; margin-left:auto; margi </DIV> <DIV STYLE="z-index:99"> <FORM ACTION=""> -<P><B TITLE="Bestimmt die Vergrößerungsstufe.">Zoom</B> <A HREF="javascript:set_scale(scale+0.1)">+</A> <A HREF="javascript:set_scale(scale-0.1)">–</A> <INPUT ID="zoom" NAME="zoom" TYPE="text" VALUE="2.0" SIZE="5" ONCHANGE="set_scale()"> -| <B TITLE="Beschränkt die Anzeige auf eine maximale Hop-Entfernung.">Metrik</B> <A HREF="javascript:set_maxmetric(maxmetric+1)">+</A> <A HREF="javascript:if(0<maxmetric)set_maxmetric(maxmetric-1)">–</A> <INPUT ID="maxmetric" NAME="maxmetric" TYPE="text" VALUE="3" SIZE="4" ONCHANGE="set_maxmetric(this.value)"> -| <B TITLE="Schaltet die automatischen Layout-Optimierung ein.">Optimierung</B><INPUT ID="auto_declump" NAME="auto_declump" TYPE="checkbox" ONCHANGE="set_autodeclump(this.checked)" CHECKED="CHECKED"> -| <B TITLE="Zeige Hostnamen an.">Hostnamen</B><INPUT ID="show_hostnames" NAME="show_hostnames" TYPE="checkbox" ONCHANGE="set_showdesc(this.checked)" CHECKED="CHECKED"> -| <A HREF="javascript:viz_save()" TITLE="Speichert die aktuellen Einstellungen in einem Cookie.">Speichern</A> -| <A HREF="javascript:viz_reset()" TITLE="Startet das Viz-Skriptprogramm neu.">Zurücksetzen</A></P> +<P><B TITLE="Bestimmt die Vergrößerungsstufe.">Zoom</B> <A HREF="javascript:set_scale(scale+0.1)">+</A> <A HREF="javascript:set_scale(scale-0.1)">–</A> <INPUT ID="zoom" NAME="zoom" TYPE="text" VALUE="2.0" SIZE="5" ONCHANGE="set_scale()">  +|  <B TITLE="Beschränkt die Anzeige auf eine maximale Hop-Entfernung.">Metrik</B> <A HREF="javascript:set_maxmetric(maxmetric+1)">+</A> <A HREF="javascript:if(0<maxmetric)set_maxmetric(maxmetric-1)">–</A> <INPUT ID="maxmetric" NAME="maxmetric" TYPE="text" VALUE="3" SIZE="4" ONCHANGE="set_maxmetric(this.value)">  +|  <B TITLE="Schaltet die automatischen Layout-Optimierung ein.">Optimierung</B><INPUT ID="auto_declump" NAME="auto_declump" TYPE="checkbox" ONCHANGE="set_autodeclump(this.checked)" CHECKED="CHECKED">  +|  <B TITLE="Zeige Hostnamen an.">Hostnamen</B><INPUT ID="show_hostnames" NAME="show_hostnames" TYPE="checkbox" ONCHANGE="set_showdesc(this.checked)" CHECKED="CHECKED">  +|  <A HREF="javascript:viz_save()" TITLE="Speichert die aktuellen Einstellungen in einem Cookie.">Speichern</A>  +|  <A HREF="javascript:viz_reset()" TITLE="Startet das Viz-Skriptprogramm neu.">Zurücksetzen</A></P> </FORM></DIV> <SPAN ID="debug" STYLE="visibility:hidden;"></SPAN> <IFRAME ID="RSIFrame" NAME="RSIFrame" STYLE="border:0px; width:0px; height:0px; visibility:hidden;"> diff --git a/applications/luci-upnp/luasrc/view/upnp_status.htm b/applications/luci-upnp/luasrc/view/upnp_status.htm index 4fa9710dd3..89857d542b 100644 --- a/applications/luci-upnp/luasrc/view/upnp_status.htm +++ b/applications/luci-upnp/luasrc/view/upnp_status.htm @@ -67,7 +67,7 @@ <th class="cbi-section-table-cell"><%:External Port%></th> <th class="cbi-section-table-cell"><%:Client Address%></th> <th class="cbi-section-table-cell"><%:Client Port%></th> - <th class="cbi-section-table-cell"> </th> + <th class="cbi-section-table-cell"> </th> </tr> <tr class="cbi-section-table-row"> <td colspan="5"><em><br /><%:Collecting data...%></em></td> diff --git a/libs/web/luasrc/view/cbi/firewall_zoneforwards.htm b/libs/web/luasrc/view/cbi/firewall_zoneforwards.htm index 71679c5364..4f7686ddd9 100644 --- a/libs/web/luasrc/view/cbi/firewall_zoneforwards.htm +++ b/libs/web/luasrc/view/cbi/firewall_zoneforwards.htm @@ -41,7 +41,7 @@ $Id: firewall_zonelist.htm 5651 2009-12-26 00:09:47Z jow $ if net then zempty = false %> - +   <%- if net:name() == self.network then -%> <span style="background-color:#FFFFFF; border:1px solid #000000; padding:2px; font-weight:bold"><%=net:name()%>: <%- else -%> @@ -59,13 +59,13 @@ $Id: firewall_zonelist.htm 5651 2009-12-26 00:09:47Z jow $ <% end end %> <% if zempty then %><em><%:(empty)%></em><% end %> </label> - ⇒ +  ⇒  <% for _, fwd in ipairs(zone:get_forwardings_by("src")) do fz = fwd:dest_zone() empty = false %> <label style="background-color:<%=fz:get_color()%>; padding:0.4em"> <strong><%=fz:name()%></strong> - </label> + </label>  <% end %> <% if empty then %> <label style="border:1px dashed #AAAAAA; color:#AAAAAA; padding:0.3em"> diff --git a/libs/web/luasrc/view/cbi/firewall_zonelist.htm b/libs/web/luasrc/view/cbi/firewall_zonelist.htm index 037b750814..3e066383a6 100644 --- a/libs/web/luasrc/view/cbi/firewall_zonelist.htm +++ b/libs/web/luasrc/view/cbi/firewall_zonelist.htm @@ -40,7 +40,7 @@ $Id$ <ul style="margin:0; list-style-type:none; text-align:left"> <% if self.allowlocal then %> <li style="padding:0.5em"> - <input class="cbi-input-radio" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)"<%=attr("type", self.widget or "radio") .. attr("id", cbid .. "_empty") .. attr("name", cbid) .. attr("value", "") .. ifattr(checked[""], "checked", "checked")%> /> + <input class="cbi-input-radio" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)"<%=attr("type", self.widget or "radio") .. attr("id", cbid .. "_empty") .. attr("name", cbid) .. attr("value", "") .. ifattr(checked[""], "checked", "checked")%> />   <label<%=attr("for", cbid .. "_empty")%> style="background-color:<%=fwm.zone.get_color()%>; padding:0.5em"> <strong><%:Device%></strong> </label> @@ -52,7 +52,7 @@ $Id$ selected = selected or (value == zone:name()) %> <li style="padding:0.5em"> - <input class="cbi-input-radio" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)"<%=attr("type", self.widget or "radio") .. attr("id", cbid .. "." .. zone:name()) .. attr("name", cbid) .. attr("value", zone:name()) .. ifattr(checked[zone:name()], "checked", "checked")%> /> + <input class="cbi-input-radio" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)"<%=attr("type", self.widget or "radio") .. attr("id", cbid .. "." .. zone:name()) .. attr("name", cbid) .. attr("value", zone:name()) .. ifattr(checked[zone:name()], "checked", "checked")%> />   <label<%=attr("for", cbid .. "." .. zone:name())%> style="background-color:<%=zone:get_color()%>; padding:0.5em"> <strong><%=zone:name()%>:</strong> <% @@ -62,7 +62,7 @@ $Id$ if net then zempty = false %> - +   <%- if net:name() == self.network then -%> <span style="background-color:#FFFFFF; border:1px solid #000000; padding:2px; font-weight:bold"><%=net:name()%>: <%- else -%> @@ -85,9 +85,9 @@ $Id$ <% if self.widget ~= "checkbox" and not self.nocreate then %> <li style="padding:0.5em"> - <input class="cbi-input-radio" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)" type="radio"<%=attr("id", cbid .. "_new") .. attr("name", cbid) .. attr("value", "-") .. ifattr(not selected, "checked", "checked")%> /> + <input class="cbi-input-radio" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)" type="radio"<%=attr("id", cbid .. "_new") .. attr("name", cbid) .. attr("value", "-") .. ifattr(not selected, "checked", "checked")%> />   <div style="background-color:<%=fwm.zone.get_color()%>; padding:0.5em; display:inline"> - <label<%=attr("for", cbid .. "_new")%>><em><%:unspecified -or- create:%> </em></label> + <label<%=attr("for", cbid .. "_new")%>><em><%:unspecified -or- create:%> </em></label> <input style="width:6em" type="text"<%=attr("name", cbid .. ".newzone") .. ifattr(not selected, "value", luci.http.formvalue(cbid .. ".newzone") or self.default)%> onfocus="document.getElementById('<%=cbid%>_new').checked=true" /> </div> </li> diff --git a/libs/web/luasrc/view/cbi/lvalue.htm b/libs/web/luasrc/view/cbi/lvalue.htm index dba869f2ef..3bc3d0929a 100644 --- a/libs/web/luasrc/view/cbi/lvalue.htm +++ b/libs/web/luasrc/view/cbi/lvalue.htm @@ -26,7 +26,7 @@ $Id$ %> <input class="cbi-input-radio" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)" type="radio"<%= attr("id", cbid..c) .. attr("name", cbid) .. attr("value", key) .. ifattr((self:cfgvalue(section) or self.default) == key, "checked", "checked") %> /> <label<%= attr("for", cbid..c) %>><%=self.vallist[i]%></label> -<% if c == self.size then c = 0 %><% if self.orientation == "horizontal" then %> <% else %><br /><% end %> +<% if c == self.size then c = 0 %><% if self.orientation == "horizontal" then %> <% else %><br /><% end %> <% end end %> <% end %> <%+cbi/valuefooter%> diff --git a/libs/web/luasrc/view/cbi/network_ifacelist.htm b/libs/web/luasrc/view/cbi/network_ifacelist.htm index 1cedc02b74..9e3acc1121 100644 --- a/libs/web/luasrc/view/cbi/network_ifacelist.htm +++ b/libs/web/luasrc/view/cbi/network_ifacelist.htm @@ -53,7 +53,7 @@ $Id$ attr("name", cbid) .. attr("value", iface:name()) .. ifattr(checked[iface:name()], "checked", "checked") .. ifattr(iface:type() == "wifi" and not iface:is_up(), "disabled", "disabled") - %> /> + %> />   <label<%=attr("for", cbid .. "." .. iface:name())%>> <% if link then -%><a href="<%=link%>"><% end -%> <img title="<%=iface:get_type_i18n()%>" style="width:16px; height:16px; vertical-align:middle" src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" /> @@ -68,7 +68,7 @@ $Id$ attr("type", self.widget or "radio") .. attr("id", cbid .. "_custom") .. attr("name", cbid) - %> /> + %> />   <label<%=attr("for", cbid .. "_custom")%>> <img title="<%:Custom Interface%>" style="width:16px; height:16px; vertical-align:middle" src="<%=resource%>/icons/ethernet_disabled.png" /> <%:Custom Interface%>: diff --git a/libs/web/luasrc/view/cbi/network_netlist.htm b/libs/web/luasrc/view/cbi/network_netlist.htm index 4be92b9402..8840c3d07b 100644 --- a/libs/web/luasrc/view/cbi/network_netlist.htm +++ b/libs/web/luasrc/view/cbi/network_netlist.htm @@ -40,9 +40,9 @@ $Id$ attr("id", cbid .. "." .. net:name()) .. attr("name", cbid) .. attr("value", net:name()) .. ifattr(checked[net:name()], "checked", "checked") - %> /> + %> />   <label<%=attr("for", cbid .. "." .. net:name())%>> - <span style="background-color:#FFFFFF; border:1px solid #CCCCCC; padding:2px"><%=net:name()%>: +  <span style="background-color:#FFFFFF; border:1px solid #CCCCCC; padding:2px"><%=net:name()%>: <% local empty = true for _, iface in ipairs(net:get_interfaces()) do @@ -59,9 +59,9 @@ $Id$ <% if self.widget ~= "checkbox" and not self.nocreate then %> <li style="padding:0.25em 0"> - <input class="cbi-input-<%=self.widget or "radio"%>" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)" type="radio"<%=attr("id", cbid .. "_new") .. attr("name", cbid) .. attr("value", "-") .. ifattr(not value, "checked", "checked")%> /> + <input class="cbi-input-<%=self.widget or "radio"%>" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)" type="radio"<%=attr("id", cbid .. "_new") .. attr("name", cbid) .. attr("value", "-") .. ifattr(not value, "checked", "checked")%> />   <div style="padding:0.5em; display:inline"> - <label<%=attr("for", cbid .. "_new")%>><em><%:unspecified -or- create:%> </em></label> + <label<%=attr("for", cbid .. "_new")%>><em><%:unspecified -or- create:%> </em></label> <input style="width:6em" type="text"<%=attr("name", cbid .. ".newnet")%> onfocus="document.getElementById('<%=cbid%>_new').checked=true" /> </div> </li> @@ -73,7 +73,7 @@ $Id$ attr("name", cbid) .. attr("value", "") .. ifattr(not value or #value == 0, "checked", "checked") - %> /> + %> />   <div style="padding:0.5em; display:inline"> <label<%=attr("for", cbid .. "_uns")%>><em><%:unspecified%></em></label> </div> diff --git a/modules/admin-full/luasrc/view/admin_network/iface_overview.htm b/modules/admin-full/luasrc/view/admin_network/iface_overview.htm index 92376207a4..b89d613903 100644 --- a/modules/admin-full/luasrc/view/admin_network/iface_overview.htm +++ b/modules/admin-full/luasrc/view/admin_network/iface_overview.htm @@ -196,7 +196,7 @@ $Id$ <table class="cbi-section-table" style="margin:10px; empty-cells:hide"> <tr class="cbi-section-table-titles"> - <th class="cbi-section-table-cell"> </th> + <th class="cbi-section-table-cell"> </th> <th class="cbi-section-table-cell"><%:Interface%></th> <th class="cbi-section-table-cell"><%:Uptime%></th> <th class="cbi-section-table-cell"><%:MAC%></th> diff --git a/modules/admin-full/luasrc/view/admin_status/index.htm b/modules/admin-full/luasrc/view/admin_status/index.htm index bfaad75bfa..ea4ec3f5f0 100644 --- a/modules/admin-full/luasrc/view/admin_status/index.htm +++ b/modules/admin-full/luasrc/view/admin_status/index.htm @@ -549,7 +549,7 @@ $Id$ <table class="cbi-section-table" id="wifi_assoc_table"> <tr class="cbi-section-table-titles"> - <th class="cbi-section-table-cell"> </th> + <th class="cbi-section-table-cell"> </th> <th class="cbi-section-table-cell"><%:BSSID%></th> <th class="cbi-section-table-cell"><%:Network%></th> <th class="cbi-section-table-cell"><%:Signal%></th> diff --git a/modules/admin-full/luasrc/view/admin_system/packages.htm b/modules/admin-full/luasrc/view/admin_system/packages.htm index 0b00324f46..854dedfba4 100644 --- a/modules/admin-full/luasrc/view/admin_system/packages.htm +++ b/modules/admin-full/luasrc/view/admin_system/packages.htm @@ -73,7 +73,7 @@ local free_byte = space_free * fstat.frsize <fieldset class="cbi-section"> <%:Free space%>: <strong><%=(100-used_perc)%>%</strong> (<strong><%=wa.byte_format(free_byte)%></strong>) <div style="margin:3px 0; width:300px; height:10px; border:1px solid #000000; background-color:#80C080"> - <div style="background-color:#F08080; border-right:1px solid #000000; height:100%; width:<%=used_perc%>%"> </div> + <div style="background-color:#F08080; border-right:1px solid #000000; height:100%; width:<%=used_perc%>%"> </div> </div> <% if (install and next(install)) or (remove and next(remove)) or update or upgrade then %> @@ -99,7 +99,7 @@ local free_byte = space_free * fstat.frsize <fieldset class="cbi-section"> <table class="cbi-section-table" style="width:100%"> <tr class="cbi-section-table-titles"> - <th class="cbi-section-table-cell" style="text-align:left"> </th> + <th class="cbi-section-table-cell" style="text-align:left"> </th> <th class="cbi-section-table-cell" style="text-align:left"><%:Package name%></th> <th class="cbi-section-table-cell" style="text-align:left"><%:Version%></th> </tr> @@ -112,7 +112,7 @@ local free_byte = space_free * fstat.frsize <% end) %> <% if empty then %> <tr class="cbi-section-table-row"> - <td style="text-align:left"> </td> + <td style="text-align:left"> </td> <td style="text-align:left"><em><%:none%></em></td> <td style="text-align:left"><em><%:none%></em></td> </tr> @@ -127,7 +127,7 @@ local free_byte = space_free * fstat.frsize <fieldset class="cbi-section"> <table class="cbi-section-table" style="width:100%"> <tr class="cbi-section-table-titles"> - <th class="cbi-section-table-cell" style="text-align:left"> </th> + <th class="cbi-section-table-cell" style="text-align:left"> </th> <th class="cbi-section-table-cell" style="text-align:left"><%:Package name%></th> <th class="cbi-section-table-cell" style="text-align:left"><%:Version%></th> <th class="cbi-section-table-cell" style="text-align:left"><%:Description%></th> @@ -142,7 +142,7 @@ local free_byte = space_free * fstat.frsize <% end) %> <% if empty then %> <tr class="cbi-section-table-row"> - <td style="text-align:left"> </td> + <td style="text-align:left"> </td> <td style="text-align:left"><em><%:none%></em></td> <td style="text-align:left"><em><%:none%></em></td> <td style="text-align:left"><em><%:none%></em></td> diff --git a/modules/admin-full/luasrc/view/admin_uci/changelog.htm b/modules/admin-full/luasrc/view/admin_uci/changelog.htm index 13bbdffcb4..43f7bd1962 100644 --- a/modules/admin-full/luasrc/view/admin_uci/changelog.htm +++ b/modules/admin-full/luasrc/view/admin_uci/changelog.htm @@ -16,10 +16,10 @@ $Id$ <fieldset class="cbi-section"> <strong><%:Legend:%></strong> <div class="uci-change-legend"> - <div class="uci-change-legend-label"><ins> </ins> <%:Section added%></div> - <div class="uci-change-legend-label"><del> </del> <%:Section removed%></div> - <div class="uci-change-legend-label"><var><ins> </ins></var> <%:Option changed%></div> - <div class="uci-change-legend-label"><var><del> </del></var> <%:Option removed%></div> + <div class="uci-change-legend-label"><ins> </ins> <%:Section added%></div> + <div class="uci-change-legend-label"><del> </del> <%:Section removed%></div> + <div class="uci-change-legend-label"><var><ins> </ins></var> <%:Option changed%></div> + <div class="uci-change-legend-label"><var><del> </del></var> <%:Option removed%></div> <br style="clear:both" /> </div> <br /> diff --git a/modules/freifunk/htdocs/luci-static/resources/OSMLatLon.htm b/modules/freifunk/htdocs/luci-static/resources/OSMLatLon.htm index 30ad5bc34d..18be30be35 100644 --- a/modules/freifunk/htdocs/luci-static/resources/OSMLatLon.htm +++ b/modules/freifunk/htdocs/luci-static/resources/OSMLatLon.htm @@ -10,7 +10,7 @@ <div id="map"></div> <div style="position:absolute; bottom:0%; width:100%; background:url('cbi/black_60.png'); font-size:10px; color:#fff;z-index:1000"> Map by <a href="http://www.openstreetmap.org" title="www.openstreetmap.org" style="color:#fff;" >openstreetmap.org</a>, License CC-BY-SA - +      <span id="osm"> Latitude: <input id="osmlat" name="osmlat" type="text" size="20" style="font-size:10px;"> Longitude: <input id="osmlon" name="osmlon" type="text" size="20" style="font-size:10px;"> diff --git a/po/fr/initmgr.po b/po/fr/initmgr.po index 164090b1fb..b538fac388 100644 --- a/po/fr/initmgr.po +++ b/po/fr/initmgr.po @@ -23,7 +23,7 @@ msgstr "" "Vous pouvez ici activer ou désactiver les scripts d'initialisation " "installés. Les changements seront pris en compte après un redémarrage.<br/" "><strong>Attention: Si vous désactivez des scripts essentiels comme \"réseau" -"\", votre équipement pourrait ne plus être accessible !</strong>" +"\", votre équipement pourrait ne plus être accessible !</strong>" msgid "Start priority" msgstr "Priorité de démarrage" |