Websever: add a page to enter serveraddress for usage in apps

This commit is contained in:
lukeIam committed 2013-12-13 18:03:00 +01:00
1 parent 6bcd849967
commit 35709fd5d1
4 files changed
+373 -285

No files matched your search

@@ -257,6 +257,11 @@ namespace ServerLib
return CServer.GetDelayedImage(id); return CServer.GetDelayedImage(id);
} }
public bool IsServerOnline()
{
return true;
}
#endregion #endregion
#region songs #region songs
@@ -97,6 +97,12 @@ namespace ServerLib
UriTemplate = "/delayedImage?id={id}")] UriTemplate = "/delayedImage?id={id}")]
CBase64Image GetDelayedImage(String id); CBase64Image GetDelayedImage(String id);
[OperationContract]
[WebInvoke(Method = "GET",
ResponseFormat = WebMessageFormat.Json,
UriTemplate = "/isServerOnline")]
bool IsServerOnline();
#endregion #endregion
#region songs #region songs
+293 -279
View File
@@ -12,321 +12,335 @@
<script src="js/i18next-1.7.1.min.js"></script> <script src="js/i18next-1.7.1.min.js"></script>
<script src="js/main.js"></script> <script src="js/main.js"></script>
</head> </head>
<body> <body>
<div id="login" data-content-theme="a" data-role="page" data-add-back-btn="true"> <div id="discover" data-content-theme="a" data-role="page" data-add-back-btn="true">
<div data-role="header"> <div data-role="header">
<h1 data-i18n="">Login</h1> <h1 data-i18n="discoverConnectHeader"></h1>
</div> </div>
<!-- /header --> <!-- /header -->
<div id="loginContent" data-role="content"> <div id="discoverContent" data-role="content">
<label for="loginName" class="input" data-i18n="loginName"></label> <label for="discoverServerAddress" class="input" data-i18n="discoverConnectServerAddress"></label>
<input type="text" id="loginName" name="loginName" data-mini="true"> <input type="text" id="discoverServerAddress" name="discoverServerAddress" data-mini="true">
<label for="loginPassword" class="input" data-i18n="loginPassword"></label> <a data-role="button" id="discoverConnect" data-i18n="discoverConnectButton"></a>
<input type="password" id="loginPassword" name="loginPassword" data-mini="true">
<br />
<a data-role="button" id="loginButton" data-i18n="loginButton"></a>
<br />
<hr />
<br />
<a data-role="button" id="registerButton" data-i18n="registerButton"></a>
</div> </div>
<!-- /content --> <!-- /content -->
</div> </div>
<!-- /page --> <!-- /page -->
<div id="login" data-content-theme="a" data-role="page" data-add-back-btn="true">
<div data-role="header">
<h1 data-i18n="">Login</h1>
</div>
<!-- /header -->
<div id="main" data-role="page" data-content-theme="a"> <div id="loginContent" data-role="content">
<div data-role="header"> <label for="loginName" class="input" data-i18n="loginName"></label>
<h1>Volcaluxe</h1> <input type="text" id="loginName" name="loginName" data-mini="true">
<label for="loginPassword" class="input" data-i18n="loginPassword"></label>
<input type="password" id="loginPassword" name="loginPassword" data-mini="true">
<br />
<a data-role="button" id="loginButton" data-i18n="loginButton"></a>
<br />
<hr />
<br />
<a data-role="button" id="registerButton" data-i18n="registerButton"></a>
</div>
<!-- /content -->
</div> </div>
<!-- /header --> <!-- /page -->
<div id="mainContent" data-role="content" data-add-back-btn="true"> <div id="main" data-role="page" data-content-theme="a">
<ul data-role="listview"> <div data-role="header">
<li> <h1>Volcaluxe</h1>
<a id="yourProfileLink" href="#" data-transition="slidefade"> </div>
<img src="img/profile.png"> <!-- /header -->
<h2 data-i18n="mainPageYourProfileLink"></h2>
<p data-i18n="mainPageYourProfileLinkDesc"></p> <div id="mainContent" data-role="content" data-add-back-btn="true">
</a> <ul data-role="listview">
</li> <li>
<li> <a id="yourProfileLink" href="#" data-transition="slidefade">
<a id="currentSongLink" href="#" data-transition="slidefade"> <img src="img/profile.png">
<img src="img/music.png"> <h2 data-i18n="mainPageYourProfileLink"></h2>
<h2 data-i18n="mainPageCurrentSongLink"></h2> <p data-i18n="mainPageYourProfileLinkDesc"></p>
<p data-i18n="mainPageCurrentSongLinkDesc"></p> </a>
</a> </li>
</li> <li>
<li> <a id="currentSongLink" href="#" data-transition="slidefade">
<a href="#selectSong" data-transition="slidefade"> <img src="img/music.png">
<img src="img/playlist.png"> <h2 data-i18n="mainPageCurrentSongLink"></h2>
<h2 data-i18n="mainPageSelectSong"></h2> <p data-i18n="mainPageCurrentSongLinkDesc"></p>
<p data-i18n="mainPageSelectSongDesc"></p> </a>
</a> </li>
</li> <li>
<li> <a href="#selectSong" data-transition="slidefade">
<a href="#selectPlaylist" data-transition="slidefade"> <img src="img/playlist.png">
<img src="img/playlists.png"> <h2 data-i18n="mainPageSelectSong"></h2>
<h2 data-i18n="mainPageSelectPlaylist"></h2> <p data-i18n="mainPageSelectSongDesc"></p>
<p data-i18n="mainPageSelectPlaylistDesc"></p> </a>
</a> </li>
</li> <li>
<li> <a href="#selectPlaylist" data-transition="slidefade">
<a id="mainPageSelectProfile" href="#selectProfile" data-transition="slidefade"> <img src="img/playlists.png">
<img src="img/profiles.png"> <h2 data-i18n="mainPageSelectPlaylist"></h2>
<h2 data-i18n="mainPageSelectProfile"></h2> <p data-i18n="mainPageSelectPlaylistDesc"></p>
<p data-i18n="mainPageSelectProfileDesc"></p> </a>
</a> </li>
</li> <li>
<li> <a id="mainPageSelectProfile" href="#selectProfile" data-transition="slidefade">
<a id="mainPageTakePhotoLink" href="#" data-transition="slidefade"> <img src="img/profiles.png">
<img src="img/photo.png"> <h2 data-i18n="mainPageSelectProfile"></h2>
<h2 data-i18n="mainPageTakePhotoLink"></h2> <p data-i18n="mainPageSelectProfileDesc"></p>
<p data-i18n="mainPageTakePhotoLinkDesc"></p> </a>
</a> </li>
</li> <li>
<li> <a id="mainPageTakePhotoLink" href="#" data-transition="slidefade">
<a id="mainPageKeyboard" href="#keyboard" data-transition="slidefade"> <img src="img/photo.png">
<img src="img/keyboard.png"> <h2 data-i18n="mainPageTakePhotoLink"></h2>
<h2 data-i18n="mainPageKeyboard"></h2> <p data-i18n="mainPageTakePhotoLinkDesc"></p>
<p data-i18n="mainPageKeyboardDesc"></p> </a>
</a> </li>
</li> <li>
<li> <a id="mainPageKeyboard" href="#keyboard" data-transition="slidefade">
<a href="#selectUserAdmin" data-transition="slidefade"> <img src="img/keyboard.png">
<img src="img/admin.png"> <h2 data-i18n="mainPageKeyboard"></h2>
<h2 data-i18n="mainPageSelectUserAdmin"></h2> <p data-i18n="mainPageKeyboardDesc"></p>
<p data-i18n="mainPageSelectUserAdminDesc"></p> </a>
</a> </li>
</li> <li>
<li> <a href="#selectUserAdmin" data-transition="slidefade">
<a id="mainPageLogoutLink" href="#" data-transition="slidefade"> <img src="img/admin.png">
<img src="img/logout.png"> <h2 data-i18n="mainPageSelectUserAdmin"></h2>
<h2 data-i18n="mainPageLogoutLink"></h2> <p data-i18n="mainPageSelectUserAdminDesc"></p>
<p data-i18n="mainPageLogoutLinkDesc"></p> </a>
</a> </li>
</li> <li>
</ul> <a id="mainPageLogoutLink" href="#" data-transition="slidefade">
<img src="img/logout.png">
<h2 data-i18n="mainPageLogoutLink"></h2>
<p data-i18n="mainPageLogoutLinkDesc"></p>
</a>
</li>
</ul>
</div>
<!-- /content -->
</div> </div>
<!-- /content --> <!-- /page -->
</div>
<!-- /page -->
<div id="selectProfile" data-content-theme="a" data-role="page" data-add-back-btn="true"> <div id="selectProfile" data-content-theme="a" data-role="page" data-add-back-btn="true">
<div data-role="header"> <div data-role="header">
<h1 data-i18n="selectProfileHeader"></h1> <h1 data-i18n="selectProfileHeader"></h1>
</div>
<!-- /header -->
<div id="selectProfileContent" data-role="content">
<ul id="selectProfileList" data-role="listview"></ul>
</div>
<!-- /content -->
</div> </div>
<!-- /header --> <!-- /page -->
<div id="selectProfileContent" data-role="content"> <div id="displayProfile" data-content-theme="a" data-role="page" data-add-back-btn="true">
<ul id="selectProfileList" data-role="listview"></ul> <div data-role="header">
<h1 data-i18n="displayProfileHeader">Profile</h1>
</div>
<!-- /header -->
<div id="displayProfileContent" data-role="content">
<img id="playerAvatar" src="img/profile.png" alt="Avatar">
<label for="playerName" class="input" data-i18n="displayProfileName"></label>
<input type="text" id="playerName" name="playerName" data-mini="true" value="Your Name">
<label for="playerType" class="select" data-i18n="displayProfilePlayerType"></label>
<select name="playerType" id="playerType">
<option value="0" data-i18n="displayProfilePlayerTypeNormal"></option>
<option value="1" data-i18n="displayProfilePlayerTypeGuest"></option>
</select>
<label for="playerDifficulty" class="select" data-i18n="displayProfilePlayerDifficulty"></label>
<select name="playerDifficulty" id="playerDifficulty">
<option value="0" data-i18n="displayProfilePlayerDifficultyEasy"></option>
<option value="1" data-i18n="displayProfilePlayerDifficultyNormal"></option>
<option value="2" data-i18n="displayProfilePlayerDifficultyHard"></option>
</select>
<label id="playerPasswordLabel" for="playerPassword" class="input" data-i18n="displayProfilePlayerPassword"></label>
<input type="password" id="playerPassword" name="playerPassword" data-mini="true" value="**oldPassword**">
<br />
<a data-role="button" id="playerSaveButton" data-i18n="displayProfilePlayerSaveButton"></a>
</div>
<!-- /content -->
</div> </div>
<!-- /content --> <!-- /page -->
</div>
<!-- /page -->
<div id="displayProfile" data-content-theme="a" data-role="page" data-add-back-btn="true"> <div id="displaySong" data-content-theme="a" data-role="page" data-add-back-btn="true">
<div data-role="header"> <div data-role="header">
<h1 data-i18n="displayProfileHeader">Profile</h1> <h1 id="displaySongTitle" data-i18n="displaySongHeader"></h1>
</div> </div>
<!-- /header --> <!-- /header -->
<div id="displayProfileContent" data-role="content"> <div id="displaySongContent" data-role="content">
<img id="playerAvatar" src="img/profile.png" alt="Avatar"> <img id="displaySongCover" src="img/noCover.png" alt="Cover">
<label for="playerName" class="input" data-i18n="displayProfileName"></label>
<input type="text" id="playerName" name="playerName" data-mini="true" value="Your Name">
<label for="playerType" class="select" data-i18n="displayProfilePlayerType"></label>
<select name="playerType" id="playerType">
<option value="0" data-i18n="displayProfilePlayerTypeNormal"></option>
<option value="1" data-i18n="displayProfilePlayerTypeGuest"></option>
</select>
<label for="playerDifficulty" class="select" data-i18n="displayProfilePlayerDifficulty"></label>
<select name="playerDifficulty" id="playerDifficulty">
<option value="0" data-i18n="displayProfilePlayerDifficultyEasy"></option>
<option value="1" data-i18n="displayProfilePlayerDifficultyNormal"></option>
<option value="2" data-i18n="displayProfilePlayerDifficultyHard"></option>
</select>
<label id="playerPasswordLabel" for="playerPassword" class="input" data-i18n="displayProfilePlayerPassword"></label>
<input type="password" id="playerPassword" name="playerPassword" data-mini="true" value="**oldPassword**">
<br />
<a data-role="button" id="playerSaveButton" data-i18n="displayProfilePlayerSaveButton"></a>
</div>
<!-- /content -->
</div>
<!-- /page -->
<div id="displaySong" data-content-theme="a" data-role="page" data-add-back-btn="true">
<div data-role="header">
<h1 id="displaySongTitle" data-i18n="displaySongHeader"></h1>
</div>
<!-- /header -->
<div id="displaySongContent" data-role="content">
<img id="displaySongCover" src="img/noCover.png" alt="Cover">
<br />
<br />
<br />
<label for="displaySongArtist" class="input" data-i18n="displaySongArtist"></label>
<span id="displaySongArtist" data-mini="true">-</span>
<br />
<label for="displaySongGenre" class="input" data-i18n="displaySongGenre"></label>
<span id="displaySongGenre" data-mini="true">-</span>
<br />
<label for="displaySongYear" class="input" data-i18n="displaySongYear"></label>
<span id="displaySongYear" data-mini="true">-</span>
<br />
<label for="displaySongLanguage" class="input" data-i18n="displaySongLanguage"></label>
<span id="displaySongLanguage" data-mini="true">-</span>
<br />
<label for="displaySongIsDuet" class="input" data-i18n="displaySongIsDuet"></label>
<span id="displaySongIsDuet" data-mini="true">-</span>
<br />
<br />
<div id="displaySongLinks">
<img class="cursorStyleClickable" id="displaySongAddPlaylist" src="img/addPlaylist.png" />
<br /> <br />
<br /> <br />
<img class="cursorStyleClickable" id="displaySongLinkYoutube" src="img/youtube.png" /> <br />
<img class="cursorStyleClickable" id="displaySongLinkSpotify" src="img/spotify.png" /> <label for="displaySongArtist" class="input" data-i18n="displaySongArtist"></label>
<img class="cursorStyleClickable" id="displaySongLinkWikipedia" src="img/wikipedia.png" /> <span id="displaySongArtist" data-mini="true">-</span>
<br />
<label for="displaySongGenre" class="input" data-i18n="displaySongGenre"></label>
<span id="displaySongGenre" data-mini="true">-</span>
<br />
<label for="displaySongYear" class="input" data-i18n="displaySongYear"></label>
<span id="displaySongYear" data-mini="true">-</span>
<br />
<label for="displaySongLanguage" class="input" data-i18n="displaySongLanguage"></label>
<span id="displaySongLanguage" data-mini="true">-</span>
<br />
<label for="displaySongIsDuet" class="input" data-i18n="displaySongIsDuet"></label>
<span id="displaySongIsDuet" data-mini="true">-</span>
<br />
<br />
<div id="displaySongLinks">
<img class="cursorStyleClickable" id="displaySongAddPlaylist" src="img/addPlaylist.png" />
<br />
<br />
<img class="cursorStyleClickable" id="displaySongLinkYoutube" src="img/youtube.png" />
<img class="cursorStyleClickable" id="displaySongLinkSpotify" src="img/spotify.png" />
<img class="cursorStyleClickable" id="displaySongLinkWikipedia" src="img/wikipedia.png" />
</div>
</div> </div>
<!-- /content -->
</div> <div data-role="popup" id="popupVideo" data-overlay-theme="a" data-theme="a" data-corners="false" data-tolerance="15,15">
<!-- /content --> <a href="#" data-role="button" data-theme="a" data-icon="delete" data-iconpos="notext" class="ui-btn-right" data-i18n="popupVideoClose"></a>
<div data-role="popup" id="popupVideo" data-overlay-theme="a" data-theme="a" data-corners="false" data-tolerance="15,15"> <iframe width="480" height="320" seamless></iframe>
<a href="#" data-role="button" data-theme="a" data-icon="delete" data-iconpos="notext" class="ui-btn-right" data-i18n="popupVideoClose"></a>
<iframe width="480" height="320" seamless></iframe>
</div>
<!-- /popup -->
</div>
<!-- /page -->
<div id="selectSong" data-content-theme="a" data-role="page" data-add-back-btn="true">
<div data-role="header">
<h1 data-i18n="selectSongHeader"></h1>
</div>
<!-- /header -->
<div id="selectSongContent" data-role="content">
<ul id="selectSongList" data-role="listview" data-filter="true" data-autodividers="true"></ul>
</div>
<!-- /content -->
</div>
<!-- /page -->
<div id="keyboard" data-content-theme="a" data-role="page" data-add-back-btn="true">
<div data-role="header">
<h1 data-i18n="keyboardHeader"></h1>
</div>
<!-- /header -->
<div id="keyboardContent" data-role="content">
<div class="ui-grid-b">
<div class="ui-block-a"></div>
<div class="ui-block-b">
<a data-role="button" id="keyboardButtonUp" data-i18n="keyboardButtonUp"></a>
</div>
<div class="ui-block-c"></div>
<div class="ui-block-a">
<a data-role="button" id="keyboardButtonLeft" data-i18n="keyboardButtonLeft"></a>
</div>
<div class="ui-block-b">
</div>
<div class="ui-block-c">
<a data-role="button" id="keyboardButtonRight" data-i18n="keyboardButtonRight"></a>
</div>
<div class="ui-block-a"></div>
<div class="ui-block-b">
<a data-role="button" id="keyboardButtonDown" data-i18n="keyboardButtonDown"></a>
</div>
<div class="ui-block-c"></div>
</div> </div>
<div class="ui-grid-b"> <!-- /popup -->
<div class="ui-block-a"> </div>
<a data-role="button" id="keyboardButtonEscape" data-i18n="keyboardButtonEscape"></a> <!-- /page -->
<div id="selectSong" data-content-theme="a" data-role="page" data-add-back-btn="true">
<div data-role="header">
<h1 data-i18n="selectSongHeader"></h1>
</div>
<!-- /header -->
<div id="selectSongContent" data-role="content">
<ul id="selectSongList" data-role="listview" data-filter="true" data-autodividers="true"></ul>
</div>
<!-- /content -->
</div>
<!-- /page -->
<div id="keyboard" data-content-theme="a" data-role="page" data-add-back-btn="true">
<div data-role="header">
<h1 data-i18n="keyboardHeader"></h1>
</div>
<!-- /header -->
<div id="keyboardContent" data-role="content">
<div class="ui-grid-b">
<div class="ui-block-a"></div>
<div class="ui-block-b">
<a data-role="button" id="keyboardButtonUp" data-i18n="keyboardButtonUp"></a>
</div>
<div class="ui-block-c"></div>
<div class="ui-block-a">
<a data-role="button" id="keyboardButtonLeft" data-i18n="keyboardButtonLeft"></a>
</div>
<div class="ui-block-b">
</div>
<div class="ui-block-c">
<a data-role="button" id="keyboardButtonRight" data-i18n="keyboardButtonRight"></a>
</div>
<div class="ui-block-a"></div>
<div class="ui-block-b">
<a data-role="button" id="keyboardButtonDown" data-i18n="keyboardButtonDown"></a>
</div>
<div class="ui-block-c"></div>
</div> </div>
<div class="ui-block-b"> <div class="ui-grid-b">
<a data-role="button" id="keyboardButtonTab" data-i18n="keyboardButtonTab"></a> <div class="ui-block-a">
<a data-role="button" id="keyboardButtonEscape" data-i18n="keyboardButtonEscape"></a>
</div>
<div class="ui-block-b">
<a data-role="button" id="keyboardButtonTab" data-i18n="keyboardButtonTab"></a>
</div>
<div class="ui-block-c">
<a data-role="button" id="keyboardButtonReturn" data-i18n="keyboardButtonReturn"></a>
</div>
</div> </div>
<div class="ui-block-c"> <div>
<a data-role="button" id="keyboardButtonReturn" data-i18n="keyboardButtonReturn"></a> <label for="keyboardButtonKeys" data-i18n="keyboardButtonKeys"></label>
<input type="text" id="keyboardButtonKeys" data-mini="true">
</div> </div>
</div> </div>
<div> <!-- /content -->
<label for="keyboardButtonKeys" data-i18n="keyboardButtonKeys"></label> </div>
<input type="text" id="keyboardButtonKeys" data-mini="true"> <!-- /page -->
<div id="selectUserAdmin" data-content-theme="a" data-role="page" data-add-back-btn="true">
<div data-role="header">
<h1 data-i18n="selectUserAdminHeader"></h1>
</div> </div>
</div> <!-- /header -->
<!-- /content -->
</div>
<!-- /page -->
<div id="selectUserAdmin" data-content-theme="a" data-role="page" data-add-back-btn="true"> <div id="selectUserAdminContent" data-role="content">
<div data-role="header"> <ul id="selectUserAdminList" data-role="listview"></ul>
<h1 data-i18n="selectUserAdminHeader"></h1> </div>
<!-- /content -->
</div> </div>
<!-- /header --> <!-- /page -->
<div id="selectUserAdminContent" data-role="content"> <div id="displayUserAdmin" data-content-theme="a" data-role="page" data-add-back-btn="true">
<ul id="selectUserAdminList" data-role="listview"></ul> <div data-role="header">
<h1 data-i18n="displayUserAdminHeader"></h1>
</div>
<!-- /header -->
<div id="displayUserAdminContent" data-role="content">
<fieldset data-role="controlgroup">
<legend></legend>
<input type="checkbox" id="roleAuthenticatedUser" checked="checked" disabled="disabled">
<label for="roleAuthenticatedUser">AuthenticatedUser</label>
<input type="checkbox" id="roleAdministrator">
<label for="roleAdministrator">Administrator</label>
</fieldset>
<a data-role="button" id="btnRoleSave" data-transition="slidefade" data-i18n="displayUserAdminContentSaveButton"></a>
</div>
<!-- /content -->
</div> </div>
<!-- /content --> <!-- /page -->
</div>
<!-- /page -->
<div id="displayUserAdmin" data-content-theme="a" data-role="page" data-add-back-btn="true"> <div id="selectPlaylist" data-content-theme="a" data-role="page" data-add-back-btn="true">
<div data-role="header"> <div data-role="header">
<h1 data-i18n="displayUserAdminHeader"></h1> <h1 data-i18n="selectPlaylistHeader"></h1>
<a id="selectPlaylistAddPlaylistButton" href="#" class="ui-btn-right" data-icon="add" data-i18n="selectPlaylistAddPlaylistButton"></a>
</div>
<!-- /header -->
<div id="selectPlaylistContent" data-role="content">
<ul data-split-theme="a" id="selectPlaylistContentList" data-role="listview" data-filter="true"></ul>
</div>
<!-- /content -->
</div> </div>
<!-- /header --> <!-- /page -->
<div id="displayUserAdminContent" data-role="content"> <div id="displayPlaylist" data-content-theme="a" data-role="page" data-add-back-btn="true">
<fieldset data-role="controlgroup"> <div id="displayPlaylistHeader" data-role="header">
<legend></legend> <h1 data-i18n="displayPlaylistHeader"></h1>
<input type="checkbox" id="roleAuthenticatedUser" checked="checked" disabled="disabled"> <a id="displayPlaylistSaveButton" class="ui-btn-right" href="#" data-icon="add" data-i18n="displayPlaylistSaveButton"></a>
<label for="roleAuthenticatedUser">AuthenticatedUser</label> </div>
<input type="checkbox" id="roleAdministrator"> <!-- /header -->
<label for="roleAdministrator">Administrator</label>
</fieldset> <div id="displayPlaylistContent" data-role="content">
<a data-role="button" id="btnRoleSave" data-transition="slidefade" data-i18n="displayUserAdminContentSaveButton"></a> <ol data-split-theme="a" id="displayPlaylistContentList" data-role="listview" data-filter="true"></ol>
</div>
<!-- /content -->
</div> </div>
<!-- /content --> <!-- /page -->
</div>
<!-- /page -->
<div id="selectPlaylist" data-content-theme="a" data-role="page" data-add-back-btn="true"> <div class="ui-loader-background"></div>
<div data-role="header"> </body>
<h1 data-i18n="selectPlaylistHeader"></h1>
<a id="selectPlaylistAddPlaylistButton" href="#" class="ui-btn-right" data-icon="add" data-i18n="selectPlaylistAddPlaylistButton"></a>
</div>
<!-- /header -->
<div id="selectPlaylistContent" data-role="content">
<ul data-split-theme="a" id="selectPlaylistContentList" data-role="listview" data-filter="true"></ul>
</div>
<!-- /content -->
</div>
<!-- /page -->
<div id="displayPlaylist" data-content-theme="a" data-role="page" data-add-back-btn="true">
<div id="displayPlaylistHeader" data-role="header">
<h1 data-i18n="displayPlaylistHeader"></h1>
<a id="displayPlaylistSaveButton" class="ui-btn-right" href="#" data-icon="add" data-i18n="displayPlaylistSaveButton"></a>
</div>
<!-- /header -->
<div id="displayPlaylistContent" data-role="content">
<ol data-split-theme="a" id="displayPlaylistContentList" data-role="listview" data-filter="true"></ol>
</div>
<!-- /content -->
</div>
<!-- /page -->
<div class="ui-loader-background"></div>
</body>
</html> </html>
<!DOCTYPE html> <!DOCTYPE html>
+69 -6
View File
@@ -6,6 +6,7 @@ var playlistIdRequest = -1;
var playlistRequestName = ""; var playlistRequestName = "";
var customSelectPlaylistSongCallback = null; var customSelectPlaylistSongCallback = null;
var sessionId = ""; var sessionId = "";
var serverBaseAddress = "";
$(document).ready(function () { $(document).ready(function () {
replaceTransitionHandler(); replaceTransitionHandler();
@@ -42,6 +43,9 @@ function replaceTransitionHandler() {
} }
function initPageLoadHandler() { function initPageLoadHandler() {
//pageLoadHandler for discover
$(document).on('pagebeforeshow', '#discover', pagebeforeshowDiscover);
//pageLoadHandler for displayProfile //pageLoadHandler for displayProfile
$(document).on('pagebeforeshow', '#displayProfile', function () { $(document).on('pagebeforeshow', '#displayProfile', function () {
if (profileIdRequest >= 0) { if (profileIdRequest >= 0) {
@@ -677,6 +681,26 @@ function pagebeforeshowLogin() {
} }
} }
function pagebeforeshowDiscover() {
if (document.location.protocol == "file:") {
if (window.localStorage) {
var address = window.localStorage.getItem("VocaluxeServerAddress");
if (address != null) {
var prom = request({ url: address + "isServerOnline" }, "Checking...").done(function () {
serverBaseAddress = address;
window.localStorage.getItem("VocaluxeServerAddress", address);
$.mobile.changePage("#login", { transition: "none" });
});
$(this).data('promise', prom);
return;
}
}
} else {
$.mobile.changePage("#login", { transition: "none" });
}
}
function initLoginPageHandler() { function initLoginPageHandler() {
var keyPressed = function (e) { var keyPressed = function (e) {
if (e.which == 13) { if (e.which == 13) {
@@ -715,7 +739,7 @@ function initLoginPageHandler() {
}); });
//Fire pageLoadHandler for login //Fire pageLoadHandler for login
pagebeforeshowLogin(); //pagebeforeshowLogin();
} }
function initMainPageHandler() { function initMainPageHandler() {
@@ -826,6 +850,37 @@ function initKeyboardPageHandler() {
}); });
} }
function initLoginPageHandler() {
var keyPressed = function (e) {
if (e.which == 13) {
$('#discoverConnect').click();
}
};
$('#discoverServerAddress').keypress(keyPressed);
$('#discoverConnect').click(function () {
var address = $('#discoverServerAddress').prop("value");
if (address != null && address != "") {
if (address.indexOf("http") != 0) {
address = "http://" + address;
}
if (address.slice(-1) != '/') {
address = address + '/';
}
request({ url: address + "isServerOnline" }, "Checking...").done(function () {
serverBaseAddress = address;
window.localStorage.getItem("VocaluxeServerAddress", address);
$.mobile.changePage("#login", { transition: "slidefade" });
});
}
});
//Fire pageLoadHandler for discover (first page shown after start)
pagebeforeshowDiscover();
$(this).removeData('promise');
}
var cachedImages = {}; var cachedImages = {};
function delayedImageLoad(elem, id, fail) { function delayedImageLoad(elem, id, fail) {
@@ -880,7 +935,7 @@ function logout() {
function checkSession() { function checkSession() {
if (ownProfileId == -1 if (ownProfileId == -1
&& profileIdRequest == -1 && profileIdRequest == -1
&& ($.mobile.activePage.attr("id") == "displayProfile" || $.mobile.activePage.attr("id") == "login")) { && ($.mobile.activePage.attr("id") == "displayProfile" || $.mobile.activePage.attr("id") == "login" || $.mobile.activePage.attr("id") == "discover")) {
return; return;
} }
request({ request({
@@ -925,6 +980,7 @@ function request(data, message) {
} }
} else { } else {
data["headers"]["session"] = sessionId; data["headers"]["session"] = sessionId;
data.url = serverBaseAddress + data.url;
} }
return $.ajax(data).always(function (result) { return $.ajax(data).always(function (result) {
@@ -1142,7 +1198,11 @@ function initTranslation() {
'This is not a valid name.': 'This is not a valid name.', 'This is not a valid name.': 'This is not a valid name.',
'Uploading profile...': 'Uploading profile...', 'Uploading profile...': 'Uploading profile...',
'songs': 'songs', 'songs': 'songs',
'YourName': 'YourName' 'YourName': 'YourName',
'discoverConnectHeader': 'Connect to server',
'discoverConnectServerAddress': 'Serveraddress:',
'discoverConnectButton': 'Connect',
'Checking...': 'Checking...'
} }
}, },
"de": { "de": {
@@ -1217,15 +1277,18 @@ function initTranslation() {
'This is not a valid name.': 'Dies ist kein gültiger Name.', 'This is not a valid name.': 'Dies ist kein gültiger Name.',
'Uploading profile...': 'Profil hochladen...', 'Uploading profile...': 'Profil hochladen...',
'songs': 'Lieder', 'songs': 'Lieder',
'YourName': 'DeinName' 'YourName': 'DeinName',
'discoverConnectHeader': 'Verbinde zum Server',
'discoverConnectServerAddress': 'Serveradresse:',
'discoverConnectButton': 'Verbinden',
'Checking...': 'Prüfen...'
} }
} }
}; };
$.i18n.init({ $.i18n.init({
resStore: translations, resStore: translations,
lng: "de", lng: "de",
fallbackLng: 'en', fallbackLng: 'en'
debug: true
}).done(function () { }).done(function () {
$('body').i18n(); $('body').i18n();
}); });