Permalink
Browse files

Merge pull request #7216 from gabrielesvelto/bug-821296

Bug 821296 - Allow single files to be packaged as shared resources and m...
  • Loading branch information...
2 parents a3ce4c0 + 1452b86 commit 6485f486dcebed7cd158fbc5bad5d033bd523d3c @vingtetun vingtetun committed Dec 28, 2012
Showing with 10 additions and 6 deletions.
  1. +2 −2 apps/browser/index.html
  2. +3 −2 apps/communications/ftu/index.html
  3. +2 −1 apps/system/index.html
  4. +3 −1 build/webapp-zip.js
View
4 apps/browser/index.html
@@ -18,7 +18,8 @@
<script type="application/javascript" defer src="shared/js/gesture_detector.js"></script>
<!-- Resources -->
- <link rel="resource" type="image/png" href="shared/resources/branding/"/>
+ <link rel="resource" type="image/png" href="shared/resources/branding/Browser.png"/>
+ <link rel="resource" type="image/png" href="shared/resources/branding/about_logo.png"/>
</head>
<body class="page-screen" role="application">
@@ -243,4 +244,3 @@ <h2 data-l10n-id="privacy-and-security">Privacy & Security</h2>
</body>
</html>
-
View
5 apps/communications/ftu/index.html
@@ -20,7 +20,9 @@
<title>Welcome to Browser OS</title>
<!-- Localization -->
- <link rel="resource" type="image/png" href="/shared/resources/branding/"/>
+ <link rel="resource" type="image/png" href="/shared/resources/branding/logosmall.png"/>
+ <link rel="resource" type="image/png" href="/shared/resources/branding/powered.png"/>
+ <link rel="resource" type="image/png" href="/shared/resources/branding/privacy_sprite.png"/>
<link rel="resource" type="application/l10n" href="/shared/locales/branding.ini"/>
<link rel="resource" type="application/l10n" href="/ftu/locales/locales.ini"/>
<link rel="resource" type="application/l10n" href="/shared/locales/date.ini"/>
@@ -488,4 +490,3 @@ <h1 data-l10n-id='offline-dialog-title'>You must be connected to the Internet to
<iframe id="fb-extensions"></iframe>
</body>
</html>
-
View
3 apps/system/index.html
@@ -33,7 +33,8 @@
<!-- Include shared resources
<link rel="resource" type="application/json" href="shared/resources/apn.json"/>
- <link rel="resource" type="image/png" href="shared/resources/branding/"/>
+ <link rel="resource" type="image/png" href="shared/resources/branding/initlogo.png"/>
+ <link rel="resource" type="image/png" href="shared/resources/branding/splash_screen_generic.png"/>
-->
<!-- applications.js must not be deferred
View
4 build/webapp-zip.js
@@ -254,6 +254,9 @@ Gaia.webapps.forEach(function(webapp) {
file.append('resources');
path.split('/').forEach(function(segment) {
file.append(segment);
+ if (isSubjectToBranding(file.path)) {
+ file.append((OFFICIAL == 1) ? 'official' : 'unofficial');
+ }
});
if (!file.exists()) {
throw new Error('Using inexistent shared resource: ' + path +
@@ -281,4 +284,3 @@ Gaia.webapps.forEach(function(webapp) {
zip.close();
});
-

0 comments on commit 6485f48

Please sign in to comment.