Merge pull request #49 from mozilla/bug-1056903-fxos-spice-device

Add Spice phone to Fx OS pages. Bug 1056903.
This commit is contained in:
Alex Gibson 2014-08-29 06:39:08 +01:00
Родитель 0603fad31c 8394fb29de
Коммит f07b2eb2f3
8 изменённых файлов: 226 добавлений и 71 удалений

Просмотреть файл

@ -110,7 +110,7 @@
</a>
</li>
</ul>
</div><!--/.container-->
</div>{#--/.container--#}
<div class="device-detail-list smartphone-detail-list">
<section class="device-detail smartphone-detail" id="alcatel_onetouchfire">
@ -212,7 +212,7 @@
<li>{{ _('Vivo') }}</li>
</ul>
</div>
</div><!--/.features-->
</div>{#--/.features--#}
<div class="device-details specifications pager-page" id="alcatel_onetouchfire-specifications">
<h4 class="device-details-title">{{ _('Specifications') }}</h4>
@ -313,10 +313,10 @@
</td>
</tr>
</table>
</div><!--/.specifications-->
</div><!--/.pager-content-->
</div><!--/.container-->
</section><!--/#alcatel-onetouchfire-->
</div>{#--/.specifications--#}
</div>{#--/.pager-content--#}
</div>{#--/.container--#}
</section>{#--/#alcatel-onetouchfire--#}
<section class="device-detail smartphone-detail" id="lg_fireweb">
<div id="lg_fireweb-pager" class="container pager pager-with-tabs pager-no-history">
@ -378,7 +378,7 @@
<li>{{ _('Vivo') }}</li>
</ul>
</div>
</div><!--/.features-->
</div>{#--/.features--#}
<div class="device-details pager-page specifications" id="lg_fireweb-specifications">
<h4 class="device-details-title">{{ _('Specifications') }}</h4>
@ -479,10 +479,10 @@
</td>
</tr>
</table>
</div><!--/.specifications-->
</div><!--/.pager-content-->
</div><!--/.container-->
</section><!--/#lg-fireweb-->
</div>{#--/.specifications--#}
</div>{#--/.pager-content--#}
</div>{#--/.container--#}
</section>{#--/#lg-fireweb--#}
<section class="device-detail smartphone-detail" id="zte_open">
<div id="zte_open-pager" class="container pager pager-with-tabs pager-no-history">
@ -568,7 +568,7 @@
<li>{{ _('Movistar') }}</li>
</ul>
</div>
</div><!--/.features-->
</div>{#--/.features--#}
<div class="device-details pager-page specifications" id="zte_open-specifications">
<h4 class="device-details-title">{{ _('Specifications') }}</h4>
@ -669,11 +669,11 @@
</td>
</tr>
</table>
</div><!--/.specifications-->
</div><!--/.pager-content-->
</div><!--/.container-->
</section><!--/#zte-open-->
</div><!--/.smartphone-detail-list-->
</div>{#--/.specifications--#}
</div>{#--/.pager-content--#}
</div>{#--/.container--#}
</section>{#--/#zte-open--#}
</div>{#--/.smartphone-detail-list--#}
<div class="container device-list">
<ul class="device-thumbnails">
@ -761,7 +761,7 @@
<li>{{ _('Mexico') }}</li>
</ul>
</div>
</div><!--/.features-->
</div>{#--/.features--#}
<div class="device-details specifications pager-page" id="huawei_y300-2-specifications">
<h4 class="device-details-title">{{ _('Specifications') }}</h4>
@ -844,10 +844,10 @@
</td>
</tr>
</table>
</div><!--/.specifications-->
</div><!--/.pager-content-->
</div><!--/.container-->
</section><!--/#huawei_y300-2-->
</div>{#--/.specifications--#}
</div>{#--/.pager-content--#}
</div>{#--/.container--#}
</section>{#--/#huawei_y300-2--#}
<section class="device-detail smartphone-detail" id="alcatel_onetouchfirec">
<div id="alcatel_onetouchfirec-pager" class="container pager pager-with-tabs pager-no-history">
<header class="device-detail-header">
@ -888,10 +888,10 @@
<div class="feature-group availability">
</div>
</div><!--/.features-->
</div><!--/.pager-content-->
</div><!--/.container-->
</section><!--/#alcatel_onetouchfirec-->
</div>{#--/.features--#}
</div>{#--/.pager-content--#}
</div>{#--/.container--#}
</section>{#--/#alcatel_onetouchfirec--#}
<section class="device-detail smartphone-detail" id="zte_openc">
<div id="zte_openc-pager" class="container pager pager-with-tabs pager-no-history">
<header class="device-detail-header">
@ -945,7 +945,7 @@
<li>{{ _('Uruguay') }}</li>
</ul>
</div>
</div><!--/.features-->
</div>{#--/.features--#}
<div class="device-details specifications pager-page" id="zte_openc-specifications">
<h4 class="device-details-title">{{ _('Specifications') }}</h4>
@ -998,11 +998,11 @@
</td>
</tr>
</table>
</div><!--/.specifications-->
</div><!--/.pager-content-->
</div><!--/.container-->
</section><!--/#zte_openc-->
</div><!--/.device-detail-list-->
</div>{#--/.specifications--#}
</div>{#--/.pager-content--#}
</div>{#--/.container--#}
</section>{#--/#zte_openc--#}
</div>{#--/.device-detail-list--#}
<div class="container device-list">
<ul class="device-thumbnails">
@ -1093,7 +1093,7 @@
<li>{{ _('Movistar') }}</li>
</ul>
</div>
</div><!--/.features-->
</div>{#--/.features--#}
<div class="device-details specifications pager-page" id="zte_open2-specifications">
<h4 class="device-details-title">{{ _('Specifications') }}</h4>
@ -1140,10 +1140,10 @@
</td>
</tr>
</table>
</div><!--/.specifications-->
</div><!--/.pager-content-->
</div><!--/.container-->
</section><!--/#zte_open2-->
</div>{#--/.specifications--#}
</div>{#--/.pager-content--#}
</div>{#--/.container--#}
</section>{#--/#zte_open2--#}
<section class="device-detail smartphone-detail" id="alcatel_onetouchfiree">
<div id="alcatel_onetouchfiree-pager" class="container pager pager-with-tabs pager-no-history">
<header class="device-detail-header">
@ -1199,7 +1199,7 @@
<li>{{ _('T-Mobile') }}</li>
</ul>
</div>
</div><!--/.features-->
</div>{#--/.features--#}
<div class="device-details specifications pager-page" id="alcatel_onetouchfiree-specifications">
<h4 class="device-details-title">{{ _('Specifications') }}</h4>
@ -1237,10 +1237,10 @@
</td>
</tr>
</table>
</div><!--/.specifications-->
</div><!--/.pager-content-->
</div><!--/.container-->
</section><!--/#alcatel_onetouchfiree-->
</div>{#--/.specifications--#}
</div>{#--/.pager-content--#}
</div>{#--/.container--#}
</section>{#--/##alcatel_onetouchfiree--#}
<section class="device-detail smartphone-detail" id="intex_cloudfx">
<div id="intex_cloudfx-pager" class="container pager pager-with-tabs pager-no-history">
<header class="device-detail-header">
@ -1289,13 +1289,13 @@
<li>{{ _('India') }}</li>
</ul>
<h5>{{ _('Operator') }}</h5>
<h5>{{ _('Brand') }}</h5>
<ul class="comma-list">
<li>{{ _('Intex') }}</li>
</ul>
</div>
</div><!--/.features-->
</div>{#--/.features--#}
<div class="device-details specifications pager-page" id="intex_cloudfx-specifications">
<h4 class="device-details-title">{{ _('Specifications') }}</h4>
@ -1364,12 +1364,164 @@
</td>
</tr>
</table>
</div><!--/.specifications-->
</div><!--/.pager-content-->
</div><!--/.container-->
</section><!--/#intex_cloudfx-->
</div><!--/.device-detail-list-->
</section><!--/#smartphones-->
</div>{#--/.specifications--#}
</div>{#--/.pager-content--#}
</div>{#--/.container--#}
</section>{#--/#intex_cloudfx--#}
</div>{#--/.device-detail-list--#}
<div class="container device-list">
<ul class="device-thumbnails">
<li>
<a href="#spice_fireonemifx1" class="device-thumbnail">
<img src="{{ media('/img/firefox/os/devices/smartphones/spice-fire-one-thumb.png') }}" alt="">
<span class="device-name">{{ _('Spice Fire One MI FX1') }}</span>
<div class="availability-notice">
<span class="coming-soon">{{ _('Coming Soon') }}</span>
</div>
</a>
</li>
</ul>
</div>
<div class="device-detail-list smartphone-detail-list">
<section class="device-detail smartphone-detail" id="spice_fireonemifx1">
<div id="spice_fireonemifx1-pager" class="container pager pager-with-tabs pager-no-history">
<header class="device-detail-header">
<h3 class="device-title">{{ _('Spice Fire One MI FX1') }}</h3>
<ul class="pager-tabs">
<li><a href="#p1" data-label="Features">{{_('Features')}}</a></li>
<li><a href="#p2" data-label="Specifications">{{_('Specifications')}}</a></li>
</ul>
<button class="device-detail-close">{{ _('Close') }}</button>
</header>
<div class="pager-content">
<div class="device-details features pager-page default-page" id="spice_fireonemifx1-features">
<div class="feature-group logo-colors">
</div>
<div class="feature-group image">
<img src="{{ media('/img/firefox/os/devices/smartphones/spice-fire-one.png') }}" alt="{{ _('Spice Fire One MI FX1') }}">
</div>
<div class="feature-group stats">
<ul>
<li class="stat-screen">
<strong>{{ _('3.5" HVGA') }}</strong>
{{ _('320 x 480 pixels') }}
</li>
<li class="stat-camera">
<strong>{{ _('1.3 MP') }}</strong>
{{ _('Rear camera, VGA Front camera') }}
</li>
<li class="stat-storage">
<strong>{{ _('256 MB') }}</strong>
{{ _('Internal memory') }} *
</li>
</ul>
<small>* {{ memory_disclaimer }}</small>
</div>
<div class="feature-group availability">
<h5>{{ _('Available in') }}</h5>
<ul class="comma-list">
<li>{{ _('India') }}</li>
</ul>
<h5>{{ _('Brand') }}</h5>
<ul class="comma-list">
<li>{{ _('Spice') }}</li>
</ul>
</div>
</div>{#--/.features--#}
<div class="device-details specifications pager-page" id="spice_fireonemifx1-specifications">
<h4 class="device-details-title">{{ _('Specifications') }}</h4>
<table>
<tr>
<th>{{ _('Screen') }}</th>
<td>
{{ _('3.5" HVGA 320 x 480 pixels') }}
</td>
</tr>
<tr>
<th>{{ _('Camera') }}</th>
<td>
{{ _('1.3 MP rear, VGA front') }}
</td>
</tr>
<tr>
<th>{{ _('Dimensions') }}</th>
<td>
{{ _('115.6 x 62 x 11.2 mm') }}
</td>
</tr>
<tr>
<th>{{ _('Processor') }}</th>
<td>
{{ _('1.0 GHz') }}
</td>
</tr>
<tr>
<th>{{ _('Memory') }}</th>
<td>
<dl>
<dt>{{ _('ROM') }} *</dt>
<dd>{{ _('256 MB') }}</dd>
<dt>{{ _('RAM') }}</dt>
<dd>{{ _('128 MB') }}</dd>
<dt>{{ _('Expansion slot') }}</dt>
<dd>{{ _('MicroSD up to 4 GB') }}</dd>
</dl>
<small>* {{ memory_disclaimer }}</small>
</td>
</tr>
<tr>
<th>{{ _('Battery') }}</th>
<td>
<dl>
<dt>{{ _('Capacity') }}</dt>
<dd>{{ _('1400 mAh') }}</dd>
</dl>
</td>
</tr>
<tr>
<th>{{ _('Networks') }}</th>
<td>
{{ _('GPRS/EDGE') }}
<br>
{{ _('GSM 900/1800 MHz') }}
</td>
</tr>
<tr>
<th>{{ _('Wireless') }}</th>
<td>
{{ _('Bluetooth') }}
<br>
{{ _('Wi-Fi') }}
</td>
</tr>
<tr>
<th>{{ _('Ports') }}</th>
<td>
{{ _('3.5 mm stereo headset jack') }}
</td>
</tr>
</table>
</div>{#--/.specifications--#}
</div>{#--/.pager-content--#}
</div>{#--/.container--#}
</section>{#--/#spice_fireonemifx1--#}
</div>{#--/.device-detail-list--#}
</section>{#--/#smartphones--#}
<div class="container">
<aside id="fxos-links">
<header class="section-header">
@ -1390,8 +1542,8 @@
</li>
</ul>
</aside>
</div><!--/.container-->
</article><!--/#devices-->
</div>{#--/.container--#}
</article>{#--/#devices--#}
</main>
{% include '/firefox/os/_get_device.html' %}

Просмотреть файл

@ -50,7 +50,7 @@
z-index: -10 !important;
}
html[lang="en-US"], html[lang="en-IN"] {
html[lang="en-US"] {
#get-firefox-os #adaptive-wrapper.scroller-on {
#adapt-feature-sprite-plus {
top: 286px;

Просмотреть файл

@ -651,8 +651,7 @@ section p, header p {
}
// sprites (dotted lines/plus) should essentially only show for English language pages
html[lang="en-US"] #get-firefox-os,
html[lang="en-IN"] #get-firefox-os {
html[lang="en-US"] #get-firefox-os {
#adapt-features .content {
top: 105px;
}
@ -777,7 +776,7 @@ html[lang="en-IN"] #get-firefox-os {
}
// hack for en-US visitors in India
html[lang='en-IN'], html[lang='ta'] {
html[lang='en-US'].en-IN {
.phone-wrapper .screen {
background-image: url('/media/img/firefox/os/phone/screens-en-in.jpg?2013-09');
}
@ -789,6 +788,12 @@ html[lang='hi-IN'] {
}
}
html[lang='ta'] {
.phone-wrapper .screen {
background-image: url('/media/img/firefox/os/phone/screens-ta.jpg');
}
}
html[lang^="es"] {
.phone-wrapper .screen {
background-image: url('/media/img/firefox/os/phone/screens-es-es.jpg?2013-09');
@ -1529,7 +1534,7 @@ html[lang="pl"] {
}
// get sprites (dotted lines) to sit on top of phone
html[lang="en-US"].js, html[lang="en-IN"].js {
html[lang="en-US"].js {
#get-firefox-os {
.adapt-feature-sprite {
display: block;
@ -1751,7 +1756,7 @@ html[lang="en-US"].js, html[lang="en-IN"].js {
}
}
}
html[lang="en-US"], html[lang="en-IN"] {
html[lang="en-US"] {
#masthead {
ul li {
margin: 0 10px;
@ -1899,8 +1904,8 @@ html[lang="en-US"].js, html[lang="en-IN"].js {
display: none;
}
}
// content top pos for en-US/en-IN only
html[lang="en-US"], html[lang="en-IN"] {
// content top pos for en-US only
html[lang="en-US"] {
#get-firefox-os {
.content {
left: 80px;
@ -2125,12 +2130,10 @@ html[lang="en-US"].js, html[lang="en-IN"].js {
}
}
}
// content top pos for en-US/en-IN only
html[lang="en-US"], html[lang="en-IN"] {
#get-firefox-os {
.content {
left: 65px;
}
// content top pos for en-US only
html[lang="en-US"] #get-firefox-os {
.content {
left: 65px;
}
}
#have-it-all {

Двоичные данные
media/img/firefox/os/devices/smartphones/spice-fire-one-thumb.png Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 7.0 KiB

Двоичные данные
media/img/firefox/os/devices/smartphones/spice-fire-one.png Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 23 KiB

Двоичные данные
media/img/firefox/os/phone/screens-ta.jpg Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 137 KiB

Двоичные данные
media/img/l10n/ta/firefox/os/have-it-all/marketplace.jpg Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 38 KiB

Просмотреть файл

@ -37,7 +37,7 @@
try {
if (sessionStorage.getItem(sessionLangPrefName) === 'en-IN') {
suppressLangContentSelector = true;
setEnInLocale();
setEnInContent();
}
} catch (ex) {}
@ -97,10 +97,10 @@
}
/*
* Sets page lang to en-IN and displays India specific content
* Directs page to show India specific content while still in en-US locale
*/
function setEnInLocale () {
$('html').attr('lang', 'en-IN');
function setEnInContent () {
$('html').addClass('en-IN');
$('.india-show').show();
$('.india-hide').hide();
}
@ -143,7 +143,7 @@
// if selecting English, swap content and remain on page
if (language === 'English') {
setEnInLocale();
setEnInContent();
toggleLangContentSelector();