Skip to content

GitLab

Commit 0fdbc630 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

Deploy Damien's re-designed WiFi Downloads

parent 3d98691f
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 16 deletions
Resources/web/index.html
View file @ 0fdbc630
......@@ -24,7 +24,6 @@
<div class="uploads">
<ul></ul>
</div>
<div class="messageUpload">
<h1>%%WEBINTF_DROPFILES%%</h1>
<p>%%WEBINTF_DROPFILES_LONG%%</p>
......@@ -36,7 +35,7 @@
<p>%%WEBINTF_DOWNLOADFILES_LONG%%</p>
</div>
<ul class="downloads">
<ul class="main downloads cf">
%%FILES%%
</ul>
......@@ -44,5 +43,12 @@
<p>VLC for iOS is free, open-source software published by <a href="http://www.videolan.org" target="_blank">VideoLAN</a>. <br />Modification and redistribution is subject to both the <a href="http://opensource.org/licenses/GPL-2.0" target="_blank">GPLv2 (or later)</a> and the <a href="http://opensource.org/licenses/MPL-2.0" target="_blank">MPLv2</a> as well as further rights reserved by the VideoLAN association.<br />You can find the sources to this application <a href="http://git.videolan.org/?p=vlc-ports/ios.git;a=summary" target="_blank">online</a> and more information about licensing in the About dialog included within the app.<br />VLC media player and VideoLAN are trademarks of the VideoLAN Association.</p>
</div>
</div>
<div id="overlay" class="">
<div id="modal">
<ul class="downloads cf">
<!-- content of div.content goes here -->
</ul>
</div>
</div>
</body>
</html>
Resources/web/style.css
View file @ 0fdbc630
......@@ -340,19 +340,19 @@ div.main.drop {
}
.downloads .inner .down.icon {
background-image: url(img/download-fixed.png);
background-image: url(web-download-fixed.png);
}
.downloads .inner .open.icon {
background-image: url(img/open-fixed.png);
background-image: url(web-open-fixed.png);
}
.downloads .inner .down.icon.bgz {
background-image: url(img/download.png);
background-image: url(web-download.png);
}
.downloads .inner .open.icon.bgz {
background-image: url(img/open.png);
background-image: url(web-open.png);
}
.downloads .inner .infos {
......
Sources/VLCHTTPConnection.m
View file @ 0fdbc630
......@@ -173,25 +173,108 @@
for (NSManagedObject *mo in allMedia) {
if ([mo isKindOfClass:[MLFile class]])
[mediaInHtml addObject:[NSString stringWithFormat:@"<li><img src=\"thumbnail/%@.png\" alt=\"No Image\" /> - <a href=\"download/%@\" download>%@</a></li>", mo.objectID.URIRepresentation, [[(MLFile *)mo url] stringByReplacingOccurrencesOfString:@"file://"withString:@""], [(MLFile *)mo title]]];
[mediaInHtml addObject:[NSString stringWithFormat:
@"<div style=\"background-image:url('thumbnail/%@.png')\"> \
<a href=\"%@\" class=\"inner\"> \
<div class=\"down icon\"></div> \
<div class=\"infos\"> \
<span class=\"first-line\">%@</span> \
<span class=\"second-line\">12:34:56 - 123MB</span> \
</div> \
</a> \
</div>",
mo.objectID.URIRepresentation,
[[(MLFile *)mo url] stringByReplacingOccurrencesOfString:@"file://"withString:@""],
[(MLFile *)mo title]]];
else if ([mo isKindOfClass:[MLShow class]]) {
NSArray *episodes = [(MLShow *)mo sortedEpisodes];
[mediaInHtml addObject:[NSString stringWithFormat:@"<div id=\"menu\"><ul><li><img src=\"thumbnail/%@.png\" alt=\"No Image\" /> - %@<ul>", mo.objectID.URIRepresentation, [(MLShow *)mo name]]];
[mediaInHtml addObject:[NSString stringWithFormat:
@"<div style=\"background-image:url('thumbnail/%@.png')\"> \
<a href=\"#\" class=\"inner\"> \
<div class=\"open icon\"></div> \
<div class=\"infos\"> \
<span class=\"first-line\">%@</span> \
<span class=\"second-line\">42 items</span> \
</div> \
</a> \
<div class=\"content\">",
mo.objectID.URIRepresentation,
[(MLShow *)mo name]]];
for (MLShowEpisode *showEp in episodes)
[mediaInHtml addObject:[NSString stringWithFormat:@"<lu><img src=\"thumbnail/%@.png\" alt=\"No Image\" /> - <a href=\"download/%@\" download>Season %@ Episode %@ - %@</a></lu><br />", showEp.objectID.URIRepresentation, [[(MLFile *)[[showEp files] anyObject] url] stringByReplacingOccurrencesOfString:@"file://"withString:@""], showEp.seasonNumber, showEp.episodeNumber, showEp.name]];
[mediaInHtml addObject:@"</ul></li></ul></div>"];
[mediaInHtml addObject:[NSString stringWithFormat:
@"<div style=\"background-image:url('thumbnail/%@.png')\"> \
<a href=\"%@\" class=\"inner\"> \
<div class=\"down icon\"></div> \
<div class=\"infos\"> \
<span class=\"first-line\">S%@E%@ - %@</span> \
<span class=\"second-line\">12:34:56 - 123MB</span> \
</div> \
</a> \
</div>",
showEp.objectID.URIRepresentation,
[[(MLFile *)[[showEp files] anyObject] url] stringByReplacingOccurrencesOfString:@"file://"withString:@""],
showEp.seasonNumber,
showEp.episodeNumber,
showEp.name]];
[mediaInHtml addObject:@"</div></div>"];
} else if ([mo isKindOfClass:[MLLabel class]]) {
NSArray *folderItems = [(MLLabel *)mo sortedFolderItems];
[mediaInHtml addObject:[NSString stringWithFormat:@"<div id=\"menu\"><ul><li><img src=\"thumbnail/%@.png\" alt=\"No Image\" /> - %@<ul>", mo.objectID.URIRepresentation, [(MLLabel *)mo name]]];
[mediaInHtml addObject:[NSString stringWithFormat:
@"<div style=\"background-image:url('thumbnail/%@.png')\"> \
<a href=\"#\" class=\"inner\"> \
<div class=\"open icon\"></div> \
<div class=\"infos\"> \
<span class=\"first-line\">%@</span> \
<span class=\"second-line\">42 items</span> \
</div> \
</a> \
<div class=\"content\">",
mo.objectID.URIRepresentation,
[(MLLabel *)mo name]]];
for (MLFile *file in folderItems)
[mediaInHtml addObject:[NSString stringWithFormat:@"<lu><img src=\"thumbnail/%@.png\" alt=\"No Image\" /> - <a href=\"download/%@\" download>%@</a></lu><br />", file.objectID.URIRepresentation, [[file url] stringByReplacingOccurrencesOfString:@"file://"withString:@""], file.title]];
[mediaInHtml addObject:@"</ul></li></ul></div>"];
[mediaInHtml addObject:[NSString stringWithFormat:
@"<div style=\"background-image:url('thumbnail/%@.png')\"> \
<a href=\"%@\" class=\"inner\"> \
<div class=\"down icon\"></div> \
<div class=\"infos\"> \
<span class=\"first-line\">%@</span> \
<span class=\"second-line\">12:34:56 - 123MB</span> \
</div> \
</a> \
</div>",
file.objectID.URIRepresentation,
[[file url] stringByReplacingOccurrencesOfString:@"file://"withString:@""],
file.title]];
[mediaInHtml addObject:@"</div></div>"];
} else if ([mo isKindOfClass:[MLAlbum class]]) {
NSArray *albumTracks = [(MLAlbum *)mo sortedTracks];
[mediaInHtml addObject:[NSString stringWithFormat:@"<div id=\"menu\"><ul><li><img src=\"thumbnail/%@.png\" alt=\"No Image\" /> - %@<ul>", mo.objectID.URIRepresentation, [(MLAlbum *)mo name]]];
[mediaInHtml addObject:[NSString stringWithFormat:
@"<div style=\"background-image:url('thumbnail/%@.png')\"> \
<a href=\"#\" class=\"inner\"> \
<div class=\"open icon\"></div> \
<div class=\"infos\"> \
<span class=\"first-line\">%@</span> \
<span class=\"second-line\">42 items</span> \
</div> \
</a> \
<div class=\"content\">",
mo.objectID.URIRepresentation,
[(MLAlbum *)mo name]]];
for (MLAlbumTrack *track in albumTracks)
[mediaInHtml addObject:[NSString stringWithFormat:@"<lu><img src=\"thumbnail/%@.png\" alt=\"No Image\" /> - <a href=\"download/%@\" download>%@</a></lu><br />", track.objectID.URIRepresentation, [[(MLFile *)[[track files] anyObject] url] stringByReplacingOccurrencesOfString:@"file://"withString:@""], track.title]];
[mediaInHtml addObject:@"</ul></li></ul></div>"];
[mediaInHtml addObject:[NSString stringWithFormat:
@"<div style=\"background-image:url('thumbnail/%@.png')\"> \
<a href=\"%@\" class=\"inner\"> \
<div class=\"down icon\"></div> \
<div class=\"infos\"> \
<span class=\"first-line\">%@</span> \
<span class=\"second-line\">12:34:56 - 123MB</span> \
</div> \
</a> \
</div>",
track.objectID.URIRepresentation,
[[(MLFile *)[[track files] anyObject] url] stringByReplacingOccurrencesOfString:@"file://"withString:@""],
track.title]];
[mediaInHtml addObject:@"</div></div>"];
}
}
......
VLC for iOS.xcodeproj/project.pbxproj
View file @ 0fdbc630
......@@ -369,6 +369,10 @@
7DEB3B8B1764A4F40038FC70 /* movie.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DEB3B821764A4F40038FC70 /* movie.png */; };
7DEB3B8C1764A4F40038FC70 /* blank.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DEB3B831764A4F40038FC70 /* blank.png */; };
7DEB3B8D1764A4F40038FC70 /* blank@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DEB3B841764A4F40038FC70 /* blank@2x.png */; };
7DF04F4D1961F2B8004A5429 /* web-download-fixed.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DF04F491961F2B8004A5429 /* web-download-fixed.png */; };
7DF04F4E1961F2B8004A5429 /* web-download.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DF04F4A1961F2B8004A5429 /* web-download.png */; };
7DF04F4F1961F2B8004A5429 /* web-open-fixed.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DF04F4B1961F2B8004A5429 /* web-open-fixed.png */; };
7DF04F501961F2B8004A5429 /* web-open.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DF04F4C1961F2B8004A5429 /* web-open.png */; };
7DF1166C176CC69A009EC05C /* volumeballslider.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DF1166A176CC69A009EC05C /* volumeballslider.png */; };
7DF1166D176CC69A009EC05C /* volumeballslider@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DF1166B176CC69A009EC05C /* volumeballslider@2x.png */; };
7DF7CA0717650C2A00C61739 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DF7CA0617650C2A00C61739 /* AVFoundation.framework */; };
......@@ -1049,6 +1053,10 @@
7DEB3B821764A4F40038FC70 /* movie.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = movie.png; sourceTree = "<group>"; };
7DEB3B831764A4F40038FC70 /* blank.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = blank.png; sourceTree = "<group>"; };
7DEB3B841764A4F40038FC70 /* blank@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "blank@2x.png"; sourceTree = "<group>"; };
7DF04F491961F2B8004A5429 /* web-download-fixed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "web-download-fixed.png"; path = "Resources/web-download-fixed.png"; sourceTree = SOURCE_ROOT; };
7DF04F4A1961F2B8004A5429 /* web-download.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "web-download.png"; path = "Resources/web-download.png"; sourceTree = SOURCE_ROOT; };
7DF04F4B1961F2B8004A5429 /* web-open-fixed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "web-open-fixed.png"; path = "Resources/web-open-fixed.png"; sourceTree = SOURCE_ROOT; };
7DF04F4C1961F2B8004A5429 /* web-open.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "web-open.png"; path = "Resources/web-open.png"; sourceTree = SOURCE_ROOT; };
7DF1166A176CC69A009EC05C /* volumeballslider.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = volumeballslider.png; sourceTree = "<group>"; };
7DF1166B176CC69A009EC05C /* volumeballslider@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "volumeballslider@2x.png"; sourceTree = "<group>"; };
7DF7CA0617650C2A00C61739 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
......@@ -1258,6 +1266,10 @@
7AC8629B1765DC560011611A /* style.css */,
7D00161A17704DAC00649F27 /* main.js */,
29125E5417492219003F03E5 /* index.html */,
7DF04F491961F2B8004A5429 /* web-download-fixed.png */,
7DF04F4A1961F2B8004A5429 /* web-download.png */,
7DF04F4B1961F2B8004A5429 /* web-open-fixed.png */,
7DF04F4C1961F2B8004A5429 /* web-open.png */,
);
path = web;
sourceTree = "<group>";
......@@ -2402,6 +2414,7 @@
9B9231C4185A703700F89498 /* VLCFutureNetworkLoginViewController.xib in Resources */,
7D1516431868D7E0004B18F3 /* VLCFirstStepsFirstPageViewController~iphone.xib in Resources */,
7D63C19318774BFB00BD5256 /* VLCFirstStepsSecondPageViewController~ipad.xib in Resources */,
7DF04F4E1961F2B8004A5429 /* web-download.png in Resources */,
7DBBF1A8183AB4300009A339 /* VLCOpenNetworkStreamViewController.xib in Resources */,
A7CB0DB31716F72600050CF3 /* PlayingExternally~ipad.png in Resources */,
7D897888185E130E009BAB5D /* Quincy.bundle in Resources */,
......@@ -2433,6 +2446,7 @@
7D53D527187729EC00A1BA97 /* connector-cable.png in Resources */,
7D07F71417566C4A00CDE21C /* menuCone.png in Resources */,
7D07F71517566C4A00CDE21C /* menuCone@2x.png in Resources */,
7DF04F501961F2B8004A5429 /* web-open.png in Resources */,
7D588D64187DD9B700469FCF /* modernSliderKnob@2x.png in Resources */,
7D278D6F18E9D6750063E109 /* tvShow@2x~ipad.png in Resources */,
7DBBF1A7183AB4300009A339 /* VLCNetworkLoginViewController.xib in Resources */,
......@@ -2603,6 +2617,7 @@
41F475D51899A438001B919F /* folderIcon~ipad.png in Resources */,
7D897875185DEF79009BAB5D /* repeat@2x.png in Resources */,
7D0699DA17CB1FAE00713BEB /* WifiUp@2x.png in Resources */,
7DF04F4F1961F2B8004A5429 /* web-open-fixed.png in Resources */,
7D53D51C187729EC00A1BA97 /* sidebar-cutout@2x.png in Resources */,
7D713959186B197800D54EDA /* darkButton.png in Resources */,
7D0699DB17CB1FAE00713BEB /* WifiUpOn.png in Resources */,
......@@ -2648,6 +2663,7 @@
7D514D4417F779C6007B960C /* Drive.png in Resources */,
7D3784DF183A99D2009EE944 /* papasscode_background.png in Resources */,
7D278D6C18E9D5EF0063E109 /* tvShow@2x.png in Resources */,
7DF04F4D1961F2B8004A5429 /* web-download-fixed.png in Resources */,
7D3784E0183A99D2009EE944 /* papasscode_background@2x.png in Resources */,
7D3784E1183A99D2009EE944 /* papasscode_failed_bg.png in Resources */,
7D53D52A187729EC00A1BA97 /* browser.png in Resources */,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment