Changeset 2335824 in fedora-web


Ignore:
Timestamp:
05/17/12 19:29:48 (2 years ago)
Author:
Sijis Aviles <sijis@…>
Branches:
master, f18-alpha, f18-beta, f19, f19-alpha, f19-beta, f20, f20-alpha, f20-beta, fudcon-redesign, startfpo-redesign, stg
Children:
8aab842
Parents:
b463e36 (diff), dd583e43 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Sijis Aviles <sijis@…> (05/17/12 19:29:48)
git-committer:
Sijis Aviles <sijis@…> (05/17/12 19:29:48)
Message:

Merge branch 'master' of ssh://git.fedorahosted.org/git/fedora-web

Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • fedoraproject.org/data/content/index.html

    raedd1fe rdd583e43  
    8585                                                  <div class="slide-canvas"> 
    8686                                                        <div class="content"> 
    87                                                                 <h2>${_('Advanced Innovation Platform')}</h2> 
    88                                                                 <p>${_('Fedora now offers the scientific spin and the robotics spin, to create a better platform for scientists, engineers and innovators.')}</p> 
    89                                                                 <p><a href="http://spins.fedoraproject.org/">${Markup(_('Learn More &gt;'))}</a></p> 
    90                                                         </div> 
     87                                                                <h2 style="visibility: hidden !important; font-size: 0; height: 1px !important;">${_('Fedora Games Spin')}</h2> 
     88                <img src="${path}/static/images/banners/spins-games-logo.png" alt="Fedora Games Spin" /> 
     89                                                                <p>${_('There are hundreds of great free and open source games, and the Fedora Games Spin has bundled some of the very best together in one bootable Fedora download. Try Quake-engine-based first-person shooter games like Tremulous, explore the fantasy and adventure of The Battle for Wesnoth, or take Wilber or Tux for a ride in Super Tux Kart!')}</p> 
     90                                                                <p><a href="http://spins.fedoraproject.org/games">${Markup(_('Learn More &gt;'))}</a></p> 
     91                                                        </div> 
     92              <img class="screenshot" src="${path}/static/images/banners/games-banner.png" alt="characters from games" /> 
     93 
    9194                                                  </div> 
    9295                                                </li> 
  • fedoraproject.org/static/css/fedora960.css

    r7ed04d2 r80a5c21  
    15381538} 
    15391539 
    1540 .slideShow #feature1 img.screenshot { 
     1540.slideShow img.screenshot { 
    15411541  position: absolute; 
    15421542  right: 0px; 
     
    15801580 
    15811581.slides #spin .content { 
     1582  padding-left: 1em; 
    15821583  left: 0px; 
    1583   width: 455px; 
     1584  width: 400px; 
    15841585} 
    15851586 
    15861587.slides #spin { 
    1587   background-color: #054C48; 
    1588   background-image: url(../images/banners/fel-banner.jpg); 
    1589   background-position: top center; 
    1590   background-repeat: no-repeat; 
    1591 } 
    1592  
     1588background: rgb(39,83,101); /* Old browsers */ 
     1589background: -moz-linear-gradient(top,  rgba(39,83,101,1) 1%, rgba(81,140,163,1) 36%, rgba(201,218,224,1) 100%); /* FF3.6+ */ 
     1590background: -webkit-gradient(linear, left top, left bottom, color-stop(1%,rgba(39,83,101,1)), color-stop(36%,rgba(81,140,163,1)), color-stop(100%,rgba(201,218,224,1))); /* Chrome,Safari4+ */ 
     1591background: -webkit-linear-gradient(top,  rgba(39,83,101,1) 1%,rgba(81,140,163,1) 36%,rgba(201,218,224,1) 100%); /* Chrome10+,Safari5.1+ */ 
     1592background: -o-linear-gradient(top,  rgba(39,83,101,1) 1%,rgba(81,140,163,1) 36%,rgba(201,218,224,1) 100%); /* Opera 11.10+ */ 
     1593background: -ms-linear-gradient(top,  rgba(39,83,101,1) 1%,rgba(81,140,163,1) 36%,rgba(201,218,224,1) 100%); /* IE10+ */ 
     1594background: linear-gradient(top,  rgba(39,83,101,1) 1%,rgba(81,140,163,1) 36%,rgba(201,218,224,1) 100%); /* W3C */ 
     1595filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#275365', endColorstr='#c9dae0',GradientType=0 ); /* IE6-9 */ 
     1596} 
    15931597/* Black backgrounds for slide content where needed */ 
     1598 
     1599 
    15941600 
    15951601.slides #group-photo .content, 
  • spins.fedoraproject.org/data/content/index.html

    r0b6434f rb463e36  
    66<?python 
    77area = "main" 
    8  
    9 #data used for ordering section  
    10 sdata = { 
    11     'broffice': _('Brazilian localized spin that provides the legal brand for OpenOffice.org in Brazil.'), 
    12     'edu': _('A special selection of applications related to educational and scientific purposes.'), 
    13     'math': "This is math", 
    14     'kiosk': _('Secure kiosks: no longer an oxymoron.'), 
    15     'kde': _('A complete, modern desktop built using the KDE Plasma Desktop.'), 
    16     'xfce': _('A complete, well-integrated Xfce desktop.'), 
    17     'lxde': _('A light, fast, less-resource hungry desktop environment.'), 
    18     'aos': _('A scaled-down version of Fedora with a small footprint for running an appliance.'), 
    19     'developer': "This is developer", 
    20     'electronic-lab': _('Fedora\'s high-end hardware design and simulation platform.'), 
    21     'fel': _('Fedora\'s high-end hardware design and simulation platform.'), 
    22     'games': _('A perfect show-case of the best games available in Fedora.'), 
    23     'design': _('Open Creativity.'), 
    24     'design-suite': _('Open Creativity.'), 
    25     'desktop': _('The Desktop spin of Fedora is the primary spin as provided on fedoraproject.org.'), 
    26     'security': _('Security analysis tools.'), 
    27     'moblin': _('The future of the mobile internet.'), 
    28     'soas': _('Discover. Reflect. Share. Learn.'), 
    29     'scientific-kde': _('Open Source Scientific Computing.'), 
    30     'robotics': _('Dive into Robotics.') 
    31 } 
    32  
    338comm_info = community_paths[random.randint(0, len(community_paths)-1)] 
    349 
     
    5732                                                        <td class="name"><a href="${relpath}/${name.lower()}/">${name}</a> <br />${num} ${_('downloads')}</td> 
    5833                                                        <td><a href="${relpath}/${name.lower()}/"><img src="${relpath}/static/images/spin/${name.lower()}-mini.png" /></a></td> 
    59                                                         <td>${sdata[name.lower()]}<br /><span class="learn-more"><a href="${relpath}/${name.lower()}/">${_('Learn more &amp; download! &gt;')}</a></span></td> 
     34                                                        <td>${spin_detail[name.lower()]}<br /><span class="learn-more"><a href="${relpath}/${name.lower()}/">${_('Learn more &amp; download! &gt;')}</a></span></td> 
    6035                                                </tr> 
    6136                                        </tbody> 
     
    7449                                                        <td class="name"><a href="${relpath}/${name.lower()}/">${name}</a> <br />${num} downloads</td> 
    7550                                                        <td><a href="${relpath}/${name.lower()}/"><img src="${relpath}/static/images/spin/${name.lower()}-mini.png" /></a></td> 
    76                                                         <td>${sdata[name.lower()]}<br /><span class="learn-more"><a href="${relpath}/${name.lower()}/">${Markup(_('Learn more &amp; download! &gt;'))}</a></span></td> 
     51                                                        <td>${spin_detail[name.lower()]}<br /><span class="learn-more"><a href="${relpath}/${name.lower()}/">${Markup(_('Learn more &amp; download! &gt;'))}</a></span></td> 
    7752                                                </tr> 
    7853                                        </tbody> 
  • spins.fedoraproject.org/data/templates/master.html

    r0b6434f rb463e36  
    177177 
    178178#data used on sidebar, for featured-spin section 
    179 sdata_feature = { 
    180     'broffice': "Brazilian localized spin that provides the legal brand for OpenOffice.org in Brazil.", 
    181     'edu': "A special selection of applications related to educational and scientific purposes.", 
    182     'math': "This is math", 
    183     'kiosk': "Secure kiosks: no longer an oxymoron.", 
    184     'kde': "A complete, modern desktop built using the KDE Plasma Desktop.", 
    185     'xfce': "A complete, well-integrated Xfce desktop.", 
    186     'lxde': "A light, fast, less-resource hungry desktop environment.", 
    187     'aos': "A scaled-down version of Fedora with a small footprint for running an appliance.", 
    188     'developer': "This is developer", 
    189     'fel': "Fedora's high-end hardware design and simulation platform.", 
    190     'electronic-lab': "Fedora's high-end hardware design and simulation platform.", 
    191     'games': "A perfect show-case of the best games available in Fedora.", 
    192     'design-suite': "Open Creativity.", 
    193     'design': "Open Creativity.", 
    194     'desktop': "The Desktop spin of Fedora is the primary spin as provided on fedoraproject.org.", 
    195     'security': "Security analysis tools.", 
    196     'moblin': "The future of the mobile internet.", 
    197     'soas': "Discover. Reflect. Share. Learn.", 
    198     'scientific-kde': "Open Source Scientific Computing.", 
    199     'robotics': "Dive into Robotics." 
     179spin_detail = { 
     180    'broffice':       _("Brazilian localized spin that provides the legal brand for OpenOffice.org in Brazil."), 
     181    'edu':            _("A special selection of applications related to educational and scientific purposes."), 
     182    'math':           _("This is math"), 
     183    'kiosk':          _("Secure kiosks: no longer an oxymoron."), 
     184    'kde':            _("A complete, modern desktop built using the KDE Plasma Desktop."), 
     185    'xfce':           _("A complete, well-integrated Xfce desktop."), 
     186    'lxde':           _("A light, fast, less-resource hungry desktop environment."), 
     187    'aos':            _("A scaled-down version of Fedora with a small footprint for running an appliance."), 
     188    'developer':      _("This is developer"), 
     189    'fel':            _("Fedora's high-end hardware design and simulation platform."), 
     190    'electronic-lab': _("Fedora's high-end hardware design and simulation platform."), 
     191    'games':          _("A perfect show-case of the best games available in Fedora."), 
     192    'design-suite':   _("Open Creativity."), 
     193    'design':         _("Open Creativity."), 
     194    'desktop':        _("The Desktop spin of Fedora is the primary spin as provided on fedoraproject.org."), 
     195    'security':       _("Security analysis tools."), 
     196    'moblin':         _("The future of the mobile internet."), 
     197    'soas':           _("Discover. Reflect. Share. Learn."), 
     198    'scientific-kde': _("Open Source Scientific Computing."), 
     199    'robotics':       _("Dive into Robotics.") 
    200200} 
    201201 
  • spins.fedoraproject.org/data/templates/sidebar.html

    rbb72185 rb463e36  
    3333                        ?> 
    3434                        <a href="${relpath}/${fspinname.lower()}/"><img src="/static/images/spin/${fspinname.lower()}-feature.png" /></a> 
    35                         <p>${_(sdata_feature[fspinname.lower()])}</p> 
     35                        <p>${_(spin_detail[fspinname.lower()])}</p> 
    3636                        <h3><a href="${relpath}/${fspinname.lower()}/">${_('Learn more &gt;')}</a></h3> 
    3737                </div> 
     
    5555                <div id="whatis-this-spin"> 
    5656                        <h2>${_('What is this Spin?')}</h2> 
    57                         <p>${_(sdata_feature[area.lower()])}</p> 
     57                        <p>${_(spin_detail[area.lower()])}</p> 
    5858                        <h3><a href="${relpath}/${area}">${_('Learn more &gt;')}</a></h3> 
    5959                </div> 
Note: See TracChangeset for help on using the changeset viewer.