diff options
9 files changed, 78 insertions, 106 deletions
diff --git a/applications/luci-app-banip/luasrc/view/banip/banip_css.htm b/applications/luci-app-banip/luasrc/view/banip/banip_css.htm index 807102452c..86efcc5f20 100644 --- a/applications/luci-app-banip/luasrc/view/banip/banip_css.htm +++ b/applications/luci-app-banip/luasrc/view/banip/banip_css.htm @@ -1,6 +1,8 @@ <style type="text/css"> textarea { + width: 100%; + height: 450px; border: 1px solid #cccccc; padding: 5px; font-size: 12px; @@ -51,16 +53,32 @@ .cbi-section-table-row > .cbi-value-field [data-dynlist] > input, .table.cbi-section-table input[type="text"], .cbi-dynlist > .item, - .table.cbi-section-table input + .table.cbi-section-table input, + .cbi-dynlist { + display: inline-block; width: 6em; + margin: 1px; + } + + .td.cbi-value-field .cbi-button + { + width: auto; + margin: 1px 0 1px -2px; + } + + .btn, + .cbi-button, + .item::after + { + -webkit-appearance: menulist; } .cbi-input-checkbox { height: 1em; } - + .cbi-input-text { text-align: left; @@ -68,9 +86,9 @@ outline: none; box-shadow: none; background: transparent; - width: 4em; + width: 6em; } - + .runtime { color: #37c; @@ -79,7 +97,7 @@ width: 100%; padding-top: 0.5rem; } - + .ripe_desc { font-style: italic; @@ -88,4 +106,12 @@ height: 20px; margin: 2px 2px; } + + .button_running + { + display: inline-block; + width: 16px; + height: 16px; + margin: 0 5px; + } </style> diff --git a/applications/luci-app-banip/luasrc/view/banip/ipsetview.htm b/applications/luci-app-banip/luasrc/view/banip/ipsetview.htm index 14932ffaef..22c1312a8f 100644 --- a/applications/luci-app-banip/luasrc/view/banip/ipsetview.htm +++ b/applications/luci-app-banip/luasrc/view/banip/ipsetview.htm @@ -15,9 +15,10 @@ This is free software, licensed under the Apache License, Version 2.0 //<![CDATA[ function ipset_view() { - var ipset = div_ipsets.querySelector("#s_ipsets").value; - var filter = document.getElementById("checkbox_filter").checked; - var view = document.getElementById("view_id"); + var div_ipsets = document.getElementById("div_ipsets"); + var ipset = div_ipsets.querySelector("#s_ipsets").value; + var filter = document.getElementById("checkbox_filter").checked; + var view = document.getElementById("view_id"); if (!ipset) { diff --git a/applications/luci-app-banip/luasrc/view/banip/ripeview.htm b/applications/luci-app-banip/luasrc/view/banip/ripeview.htm index 118504fd65..5d26ce95f1 100644 --- a/applications/luci-app-banip/luasrc/view/banip/ripeview.htm +++ b/applications/luci-app-banip/luasrc/view/banip/ripeview.htm @@ -10,8 +10,9 @@ This is free software, licensed under the Apache License, Version 2.0 //<![CDATA[ function ripe_desc() { - var query = div_ripe.querySelector("#s_ripe").value; - var output = document.getElementById("ripe_desc"); + var div_ripe = document.getElementById("div_ripe"); + var query = div_ripe.querySelector("#s_ripe").value; + var output = document.getElementById("ripe_desc"); switch (query) { case "geoloc": @@ -45,9 +46,10 @@ This is free software, licensed under the Apache License, Version 2.0 function ripe_view() { - var query = div_ripe.querySelector("#s_ripe").value; - var input = document.getElementById("ripe_input"); - var view = document.getElementById("view_id"); + var div_ripe = document.getElementById("div_ripe"); + var query = div_ripe.querySelector("#s_ripe").value; + var input = document.getElementById("ripe_input"); + var view = document.getElementById("view_id"); if (!input.value) { diff --git a/applications/luci-app-banip/luasrc/view/banip/runtime.htm b/applications/luci-app-banip/luasrc/view/banip/runtime.htm index 041fcb143c..65a58bd374 100644 --- a/applications/luci-app-banip/luasrc/view/banip/runtime.htm +++ b/applications/luci-app-banip/luasrc/view/banip/runtime.htm @@ -124,7 +124,7 @@ function btn_action(action) <label class="cbi-value-title" for="button_1"><%:Refresh IPSets%></label> <div class="cbi-value-field"> <input class="cbi-button cbi-button-apply" id="btn1" type="button" name="do_refresh" value="<%:Refresh%>" onclick="btn_action(this)" /> - <span id="btn1_running" style="display:inline-block; width:16px; height:16px; margin:0 5px"></span> + <span id="btn1_running" class="btn_running"></span> </div> </div> diff --git a/applications/luci-app-travelmate/po/ja/travelmate.po b/applications/luci-app-travelmate/po/ja/travelmate.po index 623b2f9c1e..543b9a58e8 100644 --- a/applications/luci-app-travelmate/po/ja/travelmate.po +++ b/applications/luci-app-travelmate/po/ja/travelmate.po @@ -7,19 +7,19 @@ msgstr "" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.7\n" +"X-Generator: Poedit 2.2\n" "Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" "Plural-Forms: nplurals=1; plural=0;\n" "Language: ja\n" #: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:207 msgid "AP on" -msgstr "" +msgstr "AP の場所:" #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:113 #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:51 msgid "Action" -msgstr "" +msgstr "アクション" #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:80 msgid "Add Uplink" @@ -117,7 +117,7 @@ msgstr "デバイス" #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:132 msgid "Down" -msgstr "" +msgstr "下へ" #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:93 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79 @@ -177,7 +177,7 @@ msgstr "拡張オプション" #: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:135 msgid "Faulty Stations" -msgstr "" +msgstr "問題のあるステーション" #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:148 msgid "Find and join network on" @@ -185,7 +185,7 @@ msgstr "ネットワークの検索と参加:" #: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:218 msgid "For QR-Code support please install package 'qrencode'!" -msgstr "" +msgstr "QR コードのサポートのために、'qrencode' をインストールしてください！" #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:15 msgid "" @@ -247,11 +247,11 @@ msgstr "インターフェース ウィザード" #: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:141 msgid "Last Run" -msgstr "" +msgstr "最終実行" #: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:69 msgid "Loading" -msgstr "" +msgstr "読み込み中" #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:117 msgid "" @@ -326,13 +326,15 @@ msgstr "秘密鍵へのパス" #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:68 msgid "ProActive Uplink Switch" -msgstr "" +msgstr "積極的なアップリンク切替" #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:69 msgid "" "Proactively scan and switch to a higher prioritized uplink, despite of an " "already existing connection." msgstr "" +"既存の接続に関わらず、より優先度の高いアップリンクへの積極的なスキャンと切り" +"替えを行います。" #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:103 msgid "" @@ -340,14 +342,14 @@ msgid "" "(%s). You can edit, delete or re-order existing uplinks or scan for a new " "one. The currently used uplink is emphasized in blue, faulty stations in red." msgstr "" -"Travelmate 用インターフェース（%s）に設定済みの全アップリンクの一覧です。既存" -"のアップリンクの編集や削除、並べ替えを行ったり、スキャンを行って新規アップリ" -"ンクを追加することができます。現在使用されているアップリンクは、青色で強調さ" -"れます。" +"Travelmate インターフェース（%s）に設定済みの全アップリンクの一覧です。既存の" +"アップリンクの編集や削除、並べ替えを行ったり、スキャンを行って新規アップリン" +"クを追加することができます。現在使用されているアップリンクは青色で、問題のあ" +"るステーションは赤色で強調されます。" #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:100 msgid "Radio Selection / Order" -msgstr "" +msgstr "無線の選択 / 順番" #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:94 msgid "Repeat scan" @@ -356,17 +358,19 @@ msgstr "再スキャン" #: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:25 #: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:150 msgid "Restart" -msgstr "" +msgstr "再起動" #: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:148 msgid "Restart Travelmate" -msgstr "" +msgstr "Travelmate の再起動" #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:101 msgid "" "Restrict travelmate to a single radio (e.g. 'radio1') or change the overall " "scanning order (e.g. 'radio1 radio2 radio0')." msgstr "" +"Travelmate を単一の無線（例: 'radio1'）のみに制限したり、全体的なスキャンの順" +"番を変更します（例: 'radio1 radio2 radio0'）。" #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:111 msgid "Retry limit to connect to an uplink." @@ -401,7 +405,7 @@ msgstr "スキャン:" #: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:157 msgid "Show/Hide QR-Codes" -msgstr "" +msgstr "QR コードを表示/非表示" #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:116 msgid "Signal Quality Threshold" @@ -492,7 +496,7 @@ msgstr "不明" #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:131 msgid "Up" -msgstr "" +msgstr "上へ" #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:73 msgid "Uplink / Trigger interface" @@ -556,68 +560,4 @@ msgstr "（ステルス）" #: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:207 msgid "with SSID" -msgstr "" - -#~ msgid "" -#~ "Connect your Android or iOS devices to your router's WiFi using the shown " -#~ "QR code." -#~ msgstr "" -#~ "Android や iOS デバイスを、表示される QR コードを使用して WiFi に接続しま" -#~ "す。" - -#~ msgid "" -#~ "Here you'll find the QR codes from all of your configured Access Points. " -#~ "It allows you to connect your Android or iOS devices to your router's " -#~ "WiFi using the QR code shown below." -#~ msgstr "" -#~ "ここには、構成済みの全アクセスポイントの QR コードを表示しています。以下" -#~ "の QR コードを使用して、 Android または iOS デバイスをルータの WiFi に接続" -#~ "することができます。" - -#~ msgid "QR-Codes" -#~ msgstr "QR-コード" - -#~ msgid "Radio selection" -#~ msgstr "無線の選択" - -#~ msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'." -#~ msgstr "" -#~ "Travelmate が指定された無線に接続するよう制御します。（例: 'radio0'）" - -#~ msgid "Last rundate" -#~ msgstr "最終実行日時" - -#~ msgid "" -#~ "Provides an overview of all configured uplinks for the travelmate " -#~ "interface (%s). You can edit, delete or re-order existing uplinks or scan " -#~ "for a new one. The currently used uplink is emphasized in blue." -#~ msgstr "" -#~ "Travelmate 用インターフェース（%s）に設定済みの全アップリンクの一覧です。" -#~ "既存のアップリンクの編集や削除、並べ替えを行ったり、スキャンを行って新規" -#~ "アップリンクを追加することができます。現在使用されているアップリンクは、青" -#~ "色で強調されます。" - -#~ msgid "Station ID (SSID/BSSID)" -#~ msgstr "ステーション ID (SSID / BSSID)" - -#~ msgid "Station Radio" -#~ msgstr "ステーション電波" - -#~ msgid "" -#~ "This form shows the syslog output, pre-filtered for travelmate related " -#~ "messages only." -#~ msgstr "" -#~ "このフォームには、システムログ内の Travelmate に関するメッセージのみが表示" -#~ "されます。" - -#~ msgid "Travelmate Logfile" -#~ msgstr "Travelmate ログファイル" - -#~ msgid "add it to the wan zone of the firewall.<br />" -#~ msgstr "ファイアウォールの wan ゾーンに追加します。<br />" - -#~ msgid "n/a" -#~ msgstr "利用不可" - -#~ msgid "Actions" -#~ msgstr "操作" +msgstr ", SSID:" diff --git a/modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua index 3ac49d635d..e886d84224 100644 --- a/modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua +++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua @@ -250,21 +250,19 @@ o.rmempty = false o = s:taboption("general", Flag, "nonwildcard", translate("Non-wildcard"), - translate("Bind only to specific interfaces rather than wildcard address.")) + translate("Bind dynamically to interfaces rather than wildcard address (recommended as linux default)")) o.optional = false -o.rmempty = false +o.rmempty = true o = s:taboption("general", DynamicList, "interface", translate("Listen Interfaces"), translate("Limit listening to these interfaces, and loopback.")) o.optional = true -o:depends("nonwildcard", true) o = s:taboption("general", DynamicList, "notinterface", translate("Exclude interfaces"), translate("Prevent listening on these interfaces.")) o.optional = true -o:depends("nonwildcard", true) m:section(SimpleSection).template = "lease_status" diff --git a/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua index a85872afad..f21a2775e1 100644 --- a/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua +++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua @@ -136,6 +136,13 @@ for fs in io.lines("/proc/filesystems") do end end +local ok, lines = pcall(io.lines, "/etc/filesystem") +if ok then + local fs + for fs in lines do + o:value(fs) + end +end o = mount:taboption("advanced", Value, "options", translate("Mount options"), translate("See \"mount\" manpage for details")) diff --git a/modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua index 2ea044e16a..8ae38c0db4 100644 --- a/modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua +++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua @@ -55,7 +55,7 @@ delayoff = s:option(Value, "delayoff", translate ("Off-State Delay")) delayoff:depends("trigger", "timer") -dev = s:option(ListValue, "_net_dev", translate("Device")) +dev = s:option(Value, "_net_dev", translate("Device")) dev.rmempty = true dev:value("") dev:depends("trigger", "netdev") diff --git a/themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm b/themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm index e7316770bf..21fa78e3c6 100644 --- a/themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm +++ b/themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm @@ -154,9 +154,7 @@ local nnode = cattree.nodes[r] local grandchildren = disp.node_childs(nnode) - if #grandchildren > 0 then - - else + if #grandchildren <= 0 then local title = pcdata(striptags(translate(nnode.title))) write('<span class="label logout"><a data-title="%s" href="%s">%s</a></span>' %{ @@ -287,7 +285,7 @@ <p> <%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%> </p> - <div><a class="btn" href="<%=url(" admin/system/admin")%>"> <%:Go to password configuration...%></a></div> + <div><a class="btn" href="<%=url("admin/system/admin")%>"> <%:Go to password configuration...%></a></div> </div> <%- end -%> |