platform compat

2020-05-06 18:02:14 +09:00
parent a74d0ecf8d
commit 82271f1c17
7 changed files with 69 additions and 49 deletions
--- a/app/view/make/acct.sample.html
+++ b/app/view/make/acct.sample.html
@@ -29,7 +29,7 @@
 		@@pwa@@
 	</head>

-	<body id="mainView">
+	<body id="mainView" class="@@pwaClass@@">
 		<script type="text/javascript" src="../../@@node_base@@/jquery/dist/jquery.js"></script>
 		<script type="text/javascript" src="../../js/platform/first.js"></script>
 		<script
@@ -63,12 +63,14 @@
 						<input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp" />
 						<div id="ins-suggest"></div>
 						<button class="btn waves-effect" onclick="instance()">Login</button><br />
-						@@codesetupwarn@@<br />
-						<label>
-							<input type="checkbox" class="filled-in" id="linux" />
-							<span>@@codesetup@@</span>
-						</label>
-						<br />
+						<div class="pwa">
+							@@codesetupwarn@@<br />
+							<label>
+								<input type="checkbox" class="filled-in" id="linux" />
+								<span>@@codesetup@@</span>
+							</label>
+							<br />
+						</div>
 						<label>
 							<input type="checkbox" class="filled-in" id="misskey" />
 							<span>@@thisismisskey@@</span> </label
@@ -144,5 +146,6 @@
 		<script type="text/javascript" src="../../js/login/instance.js"></script>
 		<script type="text/javascript" src="../../js/login/manager.js"></script>
 		<script type="text/javascript" src="../../js/tl/date.js"></script>
+		<script>$('body').addClass(localStorage.getItem('platform'))</script>
 	</body>
 </html>
--- a/app/view/make/index.sample.html
+++ b/app/view/make/index.sample.html
@@ -34,7 +34,7 @@
 		@@comment-end@@ @@pwa@@
 	</head>

-	<body>
+	<body class="@@pwaClass@@">
 		<script>
 			var ver = '@@versionLetter@@'
 			var gitHash = '@@gitHash@@'
@@ -356,7 +356,7 @@
 							<a class="waves-effect gray" id="cw" onclick="cw()" title="@@cwDes@@">CW</a>
 							<span
 								><span id="imgup"></span
-								><span id="imgsel"
+								><span id="imgsel" class="pwa"
 									><i
 										class="waves-effect material-icons gray"
 										onclick="fileselect()"
@@ -389,7 +389,7 @@
 							<span class=" sml mize"
 								><span>@@replyMode@@</span>: <span id="rec">@@no@@</span>/<span>@@temp@@</span>:
 								<span id="mec">@@nothing@@</span>
-								<a onclick="stamp()" class="pointer" title="@@stampWarn@@"
+								<a onclick="stamp()" class="pointer pwa" title="@@stampWarn@@"
 									>@@stamp@@: <span id="stamp">Off</span></a
 								>
 								/@@poll@@:<span id="pollsta">@@no@@</span>
@@ -444,7 +444,7 @@
 						<li>
 							<a onclick="nowplaying('spotify');">NowPlaying (Spotify)</a>
 						</li>
-						<li>
+						<li class="mac">
 							<a onclick="nowplaying('itunes');">NowPlaying (iTunes macOS)</a>
 						</li>
 						<li>
@@ -1604,7 +1604,7 @@
 					</div>
 				</div>
 			</div>
-			<a onclick="about()" class="nex waves-effect">
+			<a onclick="about()" class="nex waves-effect pwa">
 				<i class="material-icons" style="font-size: 1rem;">info</i>@@about@@ </a
 			>&nbsp;|&nbsp;
 			<a onclick="bottomReverse()" class="nex waves-effect">
@@ -1653,7 +1653,7 @@
 						<a href="setting.html" class="nex waves-effect">
 							<i class="material-icons nex" title="@@setting@@(Ctrl+Shift+S)">settings</i>
 						</a>
-						<a onclick="nano()" class="nex waves-effect">
+						<a onclick="nano()" class="nex waves-effect pwa">
 							<i class="material-icons" title="@@nanoDes@@TheDesk Nano" data-trans-title="nano_desp"
 								>remove_from_queue</i
 							>
@@ -1686,7 +1686,7 @@
 								>access_time</i
 							>
 						</a>
-						<a onclick="tips('memory')" class="nex waves-effect">
+						<a onclick="tips('memory')" class="nex waves-effect pwa">
 							<i class="material-icons nex" title="@@ramTips@@" data-trans-title="memory">memory</i>
 						</a>
 						<a onclick="tips('trend')" class="nex waves-effect imasonly" style="display:none;">
--- a/app/view/make/make.js
+++ b/app/view/make/make.js
@@ -147,9 +147,11 @@ function main(ver, basefile, pwa) {
 				source = source.replace(/@@pwa@@/g, `<link rel="manifest" href="/manifest.json" />
 				<script>var pwa = true;"serviceWorker"in navigator&&navigator.serviceWorker.register("/sw.pwa.js").then(e=>{});</script>`)
 				source = source.replace(/@@node_base@@/g, 'dependencies')
+				source = source.replace(/@@pwaClass@@/g, 'pwaView')
 			} else {
 				source = source.replace(/@@pwa@@/g, '<script>var pwa = false;</script>')
 				source = source.replace(/@@node_base@@/g, 'node_modules')
+				source = source.replace(/@@pwaClass@@/g, '')
 			}
 			fs.writeFileSync(basefile + 'view/' + lang + '/' + pages[i], source)
 		}
--- a/app/view/make/setting.sample.html
+++ b/app/view/make/setting.sample.html
@@ -32,7 +32,7 @@
 	@@pwa@@
 </head>

-<body id="mainView" style="overflow-y:scroll">
+<body id="mainView" style="overflow-y:scroll" class="@@pwaClass@@">
 	<script type="text/javascript" src="../../@@node_base@@/jquery/dist/jquery.js"></script>
 	<script type="text/javascript" src="../../js/platform/first.js"></script>
 	<script type="text/javascript" src="../../@@node_base@@/materialize-css/dist/js/materialize.js"></script>
@@ -399,7 +399,7 @@
 					style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-disable"><i
 						class="fab fa-spotify left"></i>@@disconnect@@</a>
 				<h5>@@link@@(Last.fm)</h5>
-				@@lastFmWarn@@
+				@@lastFmWarn@@<br />
 				<input type="text" style="width:150px" id="lastFmUser">
 				<button onclick="lastFmSet()" class="btn waves-effect" style="width:100px;">@@set@@</button>
 				<h5>@@templateedit@@</h5>
@@ -407,8 +407,7 @@
 				<textarea id="np-temp" class="materialize-textarea" data-length="500">#NowPlaying {song} / {album} / {artist}
 {url}</textarea><br>
 				@@template1@@<br>
-				@@template2@@<br>
-				@@template3@@<br>
+				<span class="mac">>@@template2@@</span><br>
 				<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">@@set@@</button>
 				<h5>@@postartwork@@</h5>
 				<label>
@@ -421,19 +420,21 @@
 						value="no" />
 					<span>@@no@@</span>
 				</label>
-				<h5>@@searchArtwork@@</h5>
-				@@searchArtworkWarn@@<br />
-				<label>
-					<input class="with-gap" onchange="aMusicFlagSave()" name="amw" type="radio" id="amw_yes"
-						value="yes" />
-					<span>@@yes@@</span>
-				</label>
-				<label>
-					<input class="with-gap" onchange="aMusicFlagSave()" name="amw" type="radio" id="amw_no"
-						value="no" />
-					<span>@@no@@</span>
-				</label>
-				<br>
+				<div class="mac">
+					<h5>@@searchArtwork@@</h5>
+					@@searchArtworkWarn@@<br />
+					<label>
+						<input class="with-gap" onchange="aMusicFlagSave()" name="amw" type="radio" id="amw_yes"
+							value="yes" />
+						<span>@@yes@@</span>
+					</label>
+					<label>
+						<input class="with-gap" onchange="aMusicFlagSave()" name="amw" type="radio" id="amw_no"
+							value="no" />
+						<span>@@no@@</span>
+					</label>
+					<br>
+				</div>
 			</div>
 		</li>
 		<li>