Skip to content

Commit 850189e

Browse files
thingsymthingsym
committed
Merge branch 'develop'
2 parents f369883 + 1142a24 commit 850189e

11 files changed

+39
-13
lines changed

‎languages/multi-device-switcher-ja.mo

91 Bytes
Binary file not shown.

‎languages/multi-device-switcher-ja.po

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ msgstr ""
33
"Project-Id-Version: Multi Device Switcher\n"
44
"Report-Msgid-Bugs-To: \n"
55
"POT-Creation-Date: 2012-01-17 22:01+0900\n"
6-
"PO-Revision-Date: 2013-03-21 19:37+0900\n"
6+
"PO-Revision-Date: 2014-01-08 14:35+0900\n"
77
"Last-Translator: \n"
88
"Language-Team: \n"
99
"MIME-Version: 1.0\n"
@@ -58,6 +58,9 @@ msgstr "ゲームプラットフォーム"
5858
msgid "Reset Settings to Default UserAgent"
5959
msgstr "ユーザーエージェントをデフォルトにもどす"
6060

61+
msgid "Custom Switcher UserAgent"
62+
msgstr "Custom Switcher用ユーザーエージェント"
63+
6164
msgid "Add Custom Switcher"
6265
msgstr "Custom Switcher を追加"
6366

‎languages/multi-device-switcher.pot

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ msgstr ""
5858
msgid "Reset Settings to Default UserAgent"
5959
msgstr ""
6060

61+
msgid "Custom Switcher UserAgent"
62+
msgstr ""
63+
6164
msgid "Add Custom Switcher"
6265
msgstr ""
6366

‎multi-device-switcher.css

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
1-
#admin-tabs ul.ui-tabs-nav {border-bottom:1px solid #dfdfdf; font-size:12px; height:29px; list-style-image:none; list-style-position:outside; list-style-type:none; margin:13px 0 0; overflow:visible; padding:0 0 0 8px;}
2-
#admin-tabs ul.ui-tabs-nav li {display:block; float:left; line-height:200%; list-style-image:none; list-style-position:outside; list-style-type:none; margin:0; padding:0; position:relative; text-align:center; white-space:nowrap; width:auto;}
3-
#admin-tabs ul.ui-tabs-nav li a {background:transparent none no-repeat scroll 0 50%; border-bottom:1px solid #dfdfdf; display:block; float:left; line-height:28px; padding:1px 13px 0; position:relative; text-decoration:none;}
4-
#admin-tabs ul.ui-tabs-nav li.ui-tabs-active a{-moz-border-radius-topleft:4px; -moz-border-radius-topright:4px;border:1px solid #dfdfdf; border-bottom-color:#fff; color:#333333; font-weight:normal; padding:0 12px;}
5-
#admin-tabs ul.ui-tabs-nav li.ui-tabs-selected a{-moz-border-radius-topleft:4px; -moz-border-radius-topright:4px;border:1px solid #dfdfdf; border-bottom-color:#fff; color:#333333; font-weight:normal; padding:0 12px;}
6-
#admin-tabs ul.ui-tabs-nav a:focus, a:active {outline-color:-moz-use-text-color; outline-style:none; outline-width:medium;}
1+
#admin-tabs ul.ui-tabs-nav{font-size:15px;width:100%;display:table;}
2+
#admin-tabs ul.ui-tabs-nav li{white-space:nowrap;display:table-cell;border:1px solid #ccc;border-right:none;background:#e4e4e4;}
3+
#admin-tabs ul.ui-tabs-nav li:last-child{border-right:1px solid #ccc;}
4+
#admin-tabs ul.ui-tabs-nav li a{display:block;padding:12px 10px;color:#555;text-align:center;text-decoration:none;font-weight:700;overflow:hidden;text-overflow:ellipsis;}
5+
#admin-tabs ul.ui-tabs-nav li:hover{background:#fff;}
6+
#admin-tabs ul.ui-tabs-nav li.ui-tabs-active,#admin-tabs ul.ui-tabs-nav li.ui-tabs-selected{color:#000;background:none;border-bottom-color:#f1f1f1;}
7+
#admin-tabs ul.ui-tabs-nav li.ui-tabs-active:hover,#admin-tabs ul.ui-tabs-nav li.ui-tabs-active:hover{background:none;}
8+
#admin-tabs ul.ui-tabs-nav a:focus,#admin-tabs ul.ui-tabs-nav a:active{outline-color:-moz-use-text-color;outline-style:none;outline-width:medium;}
9+
.wrap{width:60%; float:left;}
10+
#donate{width:34%; float:left; margin:2em 0;padding:0.4em;border:1px solid #ddd;}
11+
@media screen and (max-width:480px){}
12+
@media only screen and (max-width:768px){
13+
#admin-tabs ul.ui-tabs-nav{table-layout:fixed;}
14+
.wrap{width:auto; float:none;}
15+
#donate{width:auto; float:none; margin:2em 0.4em;}
16+
}

‎multi-device-switcher.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Plugin Name: Multi Device Switcher
44
Plugin URI: https://github.com/thingsym/multi-device-switcher
55
Description: This WordPress plugin allows you to set a separate theme for device (Smart Phone, Tablet PC, Mobile Phone, Game and custom).
6-
Version: 1.2.1
6+
Version: 1.2.2
77
Author: thingsym
88
Author URI: http://www.thingslabo.com/
99
License: GPL2
@@ -429,7 +429,7 @@ function multi_device_switcher_get_options() {
429429
*/
430430
function multi_device_switcher_render_page() {
431431
?>
432-
<div class="wrap" style="width: 60%; float: left;">
432+
<div class="wrap">
433433
<div id="icon-themes" class="icon32"><br></div>
434434
<h2><?php printf( __( 'Multi Device Switcher', 'multi-device-switcher' ), wp_get_theme()->get('Name') ); ?></h2>
435435
<?php settings_errors(); ?>
@@ -615,7 +615,7 @@ function multi_device_switcher_render_page() {
615615
}
616616
}
617617
$html .= '</select>';
618-
$html .= '<span class="submit"><input type="submit" name="multi_device_switcher_options[delete_custom_switcher_' . $custom_switcher_name . ']" value="' . __( 'Delete', 'multi-device-switcher' ) . '" onclick="return confirm(\'' . sprintf( __( 'Are you sure you want to delete %1$s ?', 'multi-device-switcher' ), $custom_switcher_name ) . '\');"" class="button"></span>';
618+
$html .= ' <span class="submit"><input type="submit" name="multi_device_switcher_options[delete_custom_switcher_' . $custom_switcher_name . ']" value="' . __( 'Delete', 'multi-device-switcher' ) . '" onclick="return confirm(\'' . sprintf( __( 'Are you sure you want to delete %1$s ?', 'multi-device-switcher' ), $custom_switcher_name ) . '\');" class="button"></span>';
619619
}
620620
echo $html;
621621
?>
@@ -659,6 +659,10 @@ function multi_device_switcher_render_page() {
659659
<td><span class="submit"><input type="submit" name="multi_device_switcher_options[restore_UserAgent]" value="<?php _e( 'Reset Settings to Default UserAgent', 'multi-device-switcher' ); ?>" class="button"></span></td>
660660
</tr>
661661

662+
</table>
663+
664+
<h3><?php _e( 'Custom Switcher UserAgent', 'multi-device-switcher' ); ?></h3>
665+
<table class="form-table">
662666
<?php
663667
foreach ( $options as $key => $val ) {
664668
if ( ! preg_match( "/^custom_switcher_userAgent_/", $key ) )
@@ -703,7 +707,7 @@ function multi_device_switcher_render_page() {
703707
</form>
704708
</div>
705709

706-
<div id="donate" style="width: 36%; float: left; margin: 2em 0;padding: 0.4em;border: 1px solid #ddd;">
710+
<div id="donate">
707711
<h2><?php _e( 'Donationware', 'multi-device-switcher' ); ?></h2>
708712
<p><?php _e( 'If you like this plugin, please donate to support development and maintenance.', 'multi-device-switcher' ); ?></p>
709713
<form action="https://www.paypal.com/cgi-bin/webscr" method="post">

‎pc-switcher-widget.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Widget Name: PC Switcher Widget
44
Plugin URI: https://github.com/thingsym/multi-device-switcher
55
Description: PC Switcher Widget add-on for the Multi Device Switcher. Use this widget to add the PC Switcher to a widget.
6-
Version: 1.2.1
6+
Version: 1.2.2
77
Author: thingsym
88
Author URI: http://www.thingslabo.com/
99
License: GPL2

‎readme.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ You can send your own language pack to me.
7979

8080
## Changelog
8181

82+
* Version 1.2.2
83+
* improved: improve responsiveness UI
84+
* fixed: fix html
8285
* Version 1.2.1
8386
* fixed: delete add_contextual_help
8487
* fixed: fix readme and html

‎readme.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Link: https://github.com/thingsym/multi-device-switcher
66
Tags: switcher, theme, ipad, iphone, android, tablet, mobile, game
77
Requires at least: 3.4
88
Tested up to: 3.5
9-
Stable tag: 1.2.1
9+
Stable tag: 1.2.2
1010
License: GPL2 or later
1111
License URI: http://www.gnu.org/licenses/gpl-2.0.html
1212

@@ -102,6 +102,9 @@ There are three ways how to Using the PC Switcher.
102102

103103
== Changelog ==
104104

105+
= 1.2.2 =
106+
* improved: improve responsiveness UI
107+
* fixed: fix html
105108
= 1.2.1 =
106109
* fixed: delete add_contextual_help
107110
* fixed: fix readme and html

‎screenshot-1.png

9.41 KB
Loading

‎screenshot-2.png

11.3 KB
Loading

0 commit comments

Comments
 (0)