Changeset 2105


Ignore:
Timestamp:
07/05/10 14:51:56 (19 months ago)
Author:
dart
Message:

LoReality?:
o CSS custo
o Begin i18n
o Fill some new fields in mission
o Fix

Location:
trunk/loreality
Files:
1 added
3 deleted
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/loreality/loreality/controllers/account.py

    r2104 r2105  
    88 
    99log = logging.getLogger(__name__) 
     10from pylons.i18n.translation import _, ungettext 
    1011 
    1112class AccountController(BaseController): 

  • trunk/loreality/loreality/controllers/campaign.py

    r2104 r2105  
    1616from formencode import htmlfill, variabledecode 
    1717from formencode.validators import Invalid 
     18from pylons.i18n.translation import _, ungettext 
    1819import uuid 
    1920 
    … …  
    2425    #-------------------------------------------------------------- 
    2526    def index(self, values=None, errors=None ): 
    26         c.title = "All campaigns" 
    27         c.heading = "Campaigns" 
     27        c.title = _("All campaigns") 
     28        c.heading = _("Campaigns") 
    2829        c.campaigns = meta.Session.query(model.Campaign).all() 
    2930 
    … …  
    4142 
    4243        c.title = campaign.name 
    43         c.heading = "Campaigns" 
     44        c.heading = _("Campaigns") 
    4445        c.campaign = campaign 
    4546 
    … …  
    133134 
    134135        c.title = "Edit %s"%campaign.name 
    135         c.heading = "Campaigns" 
     136        c.heading = _("Campaigns") 
    136137        c.campaign = campaign 
    137138 

  • trunk/loreality/loreality/controllers/main.py

    r2097 r2105  
    1010from authkit.authorize.pylons_adaptors import authorize 
    1111from authkit.permissions import RemoteUser, ValidAuthKitUser, UserIn 
     12from pylons.i18n.translation import _, ungettext 
     13 
    1214 
    1315log = logging.getLogger(__name__) 
    … …  
    1618 
    1719    def index(self): 
    18         c.title = "LoReality" 
    19         c.heading = "Welcome" 
    20         c.content = "It is here" 
    21         return  render('/derived/page/view.html') 
     20        c.title = _("Welcome") 
     21        c.heading = "LoReality" 
     22        c.content = _(""" 
     23<h1>Welcome</h1> 
     24<p>Welcome to LoReality server. This tool will help you to make a new step in the Lockon Reality by managing a real dynamic campaign. 
     25        """) 
     26        return  render('/derived/page/main.html') 

  • trunk/loreality/loreality/controllers/mission.py

    r2104 r2105  
    2020from formencode.validators import Invalid 
    2121import uuid 
     22from pylons.i18n.translation import _, ungettext 
    2223 
    2324class MissionController(BaseController): 
    … …  
    6061                result = schema.to_python(dict(request.params), c) 
    6162            except Invalid, e: 
    62                 return self.index( 
     63                return self.edit( 
     64                        id=id, 
    6365                    values=values, 
    6466                    errors=variabledecode.variable_encode( 
    … …  
    7476 
    7577                mission.name = result["name"] 
     78                mission.description = result["description"] 
     79                mission.date = result["date"] 
    7680                meta.Session.commit() 
    77                 return self.edit(id=id)  
     81                return self.view(id=id)  
    7882        else: 
    7983            raise Exception('Invalid action %s'%action) 
    … …  
    9599        if not values: values = {} 
    96100        values["name"] = mission.name 
     101        values["description"] = mission.description 
     102        values["date"] = mission.date 
    97103 
    98104        html = render('/derived/page/mission_edit.html') 

  • trunk/loreality/loreality/controllers/pilot.py

    r2104 r2105  
    1919from formencode import htmlfill, variabledecode 
    2020from formencode.validators import Invalid 
     21from pylons.i18n.translation import _, ungettext 
    2122import uuid 
    2223 
    … …  
    2627    #-------------------------------------------------------------- 
    2728    def index(self, values=None, errors=None ): 
    28         c.heading = "Pilots" 
    29         c.title = "All pilots" 
     29        c.heading = _("Pilots") 
     30        c.title = _("All pilots") 
    3031 
    3132        pilot_q = meta.Session.query(model.Pilot).order_by( model.Pilot.name ) 
    … …  
    4344            abort(404) 
    4445 
    45         c.heading = "Pilots" 
     46        c.heading = _("Pilots") 
    4647        c.title = pilot.name 
    4748        c.pilot = pilot 
    … …  
    6061            abort(404) 
    6162 
    62         c.heading = "Pilots" 
     63        c.heading = _("Pilots") 
    6364        c.title = "Edit %s"%pilot.name 
    6465        c.pilot = pilot 

  • trunk/loreality/loreality/controllers/squadron.py

    r2104 r2105  
    1919from formencode import htmlfill, variabledecode 
    2020from formencode.validators import Invalid 
     21from pylons.i18n.translation import _, ungettext 
    2122import uuid 
    2223 
    … …  
    3536 
    3637        c.title = "LoReality" 
    37         c.heading = "Squadrons" 
     38        c.heading = _("Squadrons") 
    3839        c.squadrons = squadrons 
    3940        c.available_pilots = self._get_pilots() 

  • trunk/loreality/loreality/model/databases.py

    r2104 r2105  
    6363    id = sa.Column(UUID(), primary_key=True,default=uuid.uuid4) 
    6464    name = sa.Column(sa.types.String, nullable=False) 
     65    description = sa.Column(sa.types.String) 
    6566    campaign_id = sa.Column(UUID(), ForeignKey('campaigns.id')) 
    6667    pilots = orm.relation('Pilot', secondary=mission_pilots, backref='missions') 
     68    date = sa.Column(sa.types.Date ) 
    6769 
    6870 

  • trunk/loreality/loreality/model/form.py

    r2104 r2105  
    3939    name =  String(not_empty=True) 
    4040    pilots = ForEach( Pilot()) 
     41    description =  String() 
     42    date =  DateConverter() 
    4143 
    4244     

  • trunk/loreality/loreality/public/style.css

    r2104 r2105  
    3333 
    3434h2{ 
    35     border-bottom: solid white 1px; 
     35    border-bottom: solid gold 1px; 
    3636} 
    3737 
    3838h3{ 
     39    margin-left: 15px; 
     40    font-style: italic; 
    3941    border-bottom: solid white 1px; 
    40     margin-left: 5px; 
     42    border-left: solid white 1px; 
    4143} 
    4244 
     45/* FORM */ 
     46fieldset{ 
     47    width: 200px ; 
     48    border: solid silver 1px; 
     49} 
     50 
     51/* LINKS */ 
     52 
     53a.action{ 
     54    font-style: italic; 
     55    font-size: small; 
     56} 

  • trunk/loreality/loreality/templates/base/index.html

    r2102 r2105  
    11## -*- coding: utf-8 -*- 
     2<%! 
     3    from pylons.i18n.translation import set_lang, get_lang 
     4%> 
    25<%namespace name="navigation" file="/component/navigation.html" import="*" />\ 
     6 
    37 
    48<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 

  • trunk/loreality/loreality/templates/derived/page/campaign.html

    r2104 r2105  
    55<h2>${c.campaign.name} 
    66% if h.auth.authorized(h.auth.is_creator): 
    7     <a href=${h.url_for(controller='campaign', action='edit',id=c.campaign.id) }>[Edit]</a> 
     7    <a href=${h.url_for(controller='campaign', action='edit',id=c.campaign.id) } class="action">[Edit]</a> 
    88%endif 
    99</h2> 
    … …  
    1919    ) 
    2020% if h.auth.authorized(h.auth.is_creator): 
    21     <a href=${h.url_for(controller='mission', action='edit',id=mission.id) }>[Edit]</a> 
    22     <a href=${h.url_for(missionid=mission.id, controller='campaign', action='delete',id=c.campaign.id) }>[Del]</a> 
     21    <a href=${h.url_for(controller='mission', action='edit',id=mission.id) } class="action">[Edit]</a> 
     22    <a href=${h.url_for(missionid=mission.id, controller='campaign', action='delete',id=c.campaign.id) } class="action">[Del]</a> 
    2323%endif 
    2424        </li> 
    … …  
    2727${campaign.add_mission(c.campaign.id)} 
    2828% if h.auth.authorized(h.auth.is_creator): 
    29 <a href=${h.url_for(controller='campaign', action='deletecampaign',id=c.campaign.id) }>[Delete the campaign]</a></li> 
     29<hr /> 
     30<a href=${h.url_for(controller='campaign', action='deletecampaign',id=c.campaign.id) } class="action">[Delete the campaign]</a></li> 
    3031%endif 
    31 <a href=${h.url_for(controller='campaign', action='index') }>[Back to overview]</a></li> 
     32<hr /> 
     33<a href=${h.url_for(controller='campaign', action='index') } class="action">[Back to overview]</a></li> 

  • trunk/loreality/loreality/templates/derived/page/campaign_edit.html

    r2104 r2105  
    2121    <a href=${h.url_for(controller='pilot', action='view',id=mission.id) }>${pilot.name}</a>  
    2222% endfor 
    23 )<a href=${h.url_for(controller='mission', action='edit',id=mission.id) }>[Edit]</a> 
    24 <a href=${h.url_for(missionid=mission.id, controller='campaign', action='delete',id=c.campaign.id) }>[Del]</a></li> 
     23)<a href=${h.url_for(controller='mission', action='edit',id=mission.id) } class="action">[Edit]</a> 
     24<a href=${h.url_for(missionid=mission.id, controller='campaign', action='delete',id=c.campaign.id) } class="action">[Del]</a></li> 
    2525% endfor 
    2626</ul> 
    2727${campaign.add_mission(c.campaign.id)} 
    28 <a href=${h.url_for(controller='campaign', action='deletecampaign',id=c.campaign.id) }>[Delete the campaign]</a></li> 
     28<hr /> 
     29<a href=${h.url_for(controller='campaign', action='deletecampaign',id=c.campaign.id) } class="action">[Delete the campaign]</a></li> 

  • trunk/loreality/loreality/templates/derived/page/mission.html

    r2104 r2105  
    55<h2>${c.mission.name} 
    66% if h.auth.authorized(h.auth.is_creator): 
    7 <a href=${h.url_for(controller='mission', action='edit',id=c.mission.id) }>[Edit]</a> 
     7<a href=${h.url_for(controller='mission', action='edit',id=c.mission.id) } class="action">[Edit]</a> 
    88%endif 
    99</h2> 
     10<h3>Date</h3> 
     11<p>${c.mission.date}</p> 
     12<h3>Description</h3> 
     13<p>${c.mission.description}</p> 
     14<h3>Pilots</h3> 
    1015<ul> 
    1116% for pilot in c.mission.pilots: 
    1217    <li><a href=${h.url_for(controller='pilot', action='edit',id=pilot.id) }>${pilot.name}</a> 
    1318    %if h.auth.authorized(h.auth.is_creator): 
    14     <a href=${h.url_for(pilotid=pilot.id, controller='mission', action='removepilot',id=c.mission.id) }>[Remove]</a></li> 
     19    <a href=${h.url_for(pilotid=pilot.id, controller='mission', action='removepilot',id=c.mission.id) } class="action">[Remove]</a></li> 
    1520    %endif 
    1621% endfor 
    … …  
    2025%endif 
    2126 
    22 <a href=${h.url_for(controller='campaign', action='view',id=c.mission.campaign_id) }>[Back to campaign]</a></li> 
     27<hr /> 
     28<a href=${h.url_for(controller='campaign', action='view',id=c.mission.campaign_id) } class="action">[Back to campaign]</a></li> 

  • trunk/loreality/loreality/templates/derived/page/mission_edit.html

    r2104 r2105  
    33 
    44 
    5 <h2>${c.mission.name}</h2> 
     5<h2><a href=${h.url_for(controller='mission', action='view',id=c.mission.id) }>${c.mission.name}</a></h2> 
    66 
    77% if h.auth.authorized(h.auth.is_creator): 
    88    ${h.form(h.url_for(controller='mission', action='process', id=c.mission.id))} 
    9     <label for="name">Name</label><br /> 
    10     ${h.text(name='name')} 
     9    <label for="name">Name</label> 
     10    ${h.text(name='name')}<br /> 
     11    <label for="description">Description</label> 
     12    ${h.text(name='description')}<br /> 
     13    <label for="date">Date</label> 
     14    ${h.text(name='date')}<br /> 
    1115    ${h.submit(name="action", value="Modify")} 
    1216    </fieldset> 
    … …  
    1822<li><a href=${h.url_for(controller='pilot', action='view',id=pilot.id) }>${pilot.name}</a>  
    1923% if h.auth.authorized(h.auth.is_creator): 
    20     <a href=${h.url_for(controller='pilot', action='edit',id=pilot.id) }>[Edit]</a> 
    21     <a href=${h.url_for(pilotid=pilot.id, controller='mission', action='removepilot',id=c.mission.id) }>[Remove]</a></li> 
     24    <a href=${h.url_for(controller='pilot', action='edit',id=pilot.id) } class="action">[Edit]</a> 
     25    <a href=${h.url_for(pilotid=pilot.id, controller='mission', action='removepilot',id=c.mission.id) } class="action">[Remove]</a></li> 
    2226%endif 
    2327%endfor 
    … …  
    2630${campaign.add_pilot(c.mission.id, c.available_pilots)} 
    2731%endif 
    28 <a href=${h.url_for(controller='campaign', action='view',id=c.mission.campaign_id) }>[Back to campaign]</a></li> 
     32<hr /> 
     33<a href=${h.url_for(controller='campaign', action='view',id=c.mission.campaign_id) } class="action">[Back to campaign]</a></li> 

  • trunk/loreality/loreality/templates/derived/page/overview_campaign.html

    r2104 r2105  
    88<li><a href=${h.url_for(controller='campaign', action='view',id=camp.id) }>${camp.name}</a> 
    99% if h.auth.authorized(h.auth.is_creator): 
    10     <a href=${h.url_for(controller='campaign', action='edit',id=camp.id) }>[Edit]</a> 
     10    <a href=${h.url_for(controller='campaign', action='edit',id=camp.id) } class="action">[Edit]</a> 
    1111%endif 
    1212    <ul> 
    … …  
    1818    ) 
    1919% if h.auth.authorized(h.auth.is_creator): 
    20     <a href=${h.url_for(controller='mission', action='edit',id=mission.id) }>[Edit]</a> 
    21     <a href=${h.url_for(missionid=mission.id, controller='campaign', action='delete',id=camp.id) }>[Del]</a> 
     20    <a href=${h.url_for(controller='mission', action='edit',id=mission.id) } class="action">[Edit]</a> 
     21    <a href=${h.url_for(missionid=mission.id, controller='campaign', action='delete',id=camp.id) } class="action">[Del]</a> 
    2222%endif 
    2323        </li> 

  • trunk/loreality/loreality/templates/derived/page/overview_pilot.html

    r2104 r2105  
    77<h3>${pilot.name} - <a href=${h.url_for(controller='squadron', action='view',id=pilot.squadron_id) }>${pilot.squadron.name}</a></h3> 
    88 
    9 Login: ${pilot.login} 
    10 % if request.environ['REMOTE_USER'] == pilot.login: 
    11 <p>It is you!</p> 
     9<p>Login: ${pilot.login}</p> 
     10% if h.auth.authorized(h.auth.is_admin) or request.environ['REMOTE_USER'] == pilot.login: 
     11<a href=${h.url_for(controller='pilot', action='edit',id=pilot.id) } class="action">[Edit]</a></li> 
    1212%endif 
    13 % if h.auth.authorized(h.auth.is_admin): 
    14 <a href=${h.url_for(controller='pilot', action='edit',id=pilot.id) }>[Edit]</a></li> 
    15 %endif 
     13<br /> 
    1614%endfor 
    1715 

  • trunk/loreality/loreality/templates/derived/page/overview_squadron.html

    r2104 r2105  
    55<h2>Squadrons</h2> 
    66% for squadron in c.squadrons: 
    7 <h3>${squadron.name}</h3> 
     7<h3><a href=${h.url_for(controller='squadron', action='view',id=squadron.id) }>${squadron.name}</a></h3> 
    88<p>Plane is ${squadron.plane}</p> 
    99% for pilot in squadron.pilots: 
    1010    <li><a href=${h.url_for(controller='pilot', action='view',id=pilot.id) }>${pilot.name}</a> 
    1111    %if h.auth.authorized(h.auth.is_leader): 
    12     <a href=${h.url_for(pilotid=pilot.id, controller='squadron', action='removepilot',id=squadron.id) }>[Remove]</a></li> 
     12    <a href=${h.url_for(pilotid=pilot.id, controller='squadron', action='removepilot',id=squadron.id) } class="action">[Remove]</a></li> 
    1313    %endif 
    1414% endfor 
    1515% if h.auth.authorized(h.auth.is_leader): 
    1616${campaign.add_pilot_to_squadron(squadron.id, c.available_pilots)} 
    17 <a href=${h.url_for(controller='squadron', action='edit',id=squadron.id) }>[Edit]</a></li> 
     17<a href=${h.url_for(controller='squadron', action='edit',id=squadron.id) } class="action">[Edit]</a></li> 
    1818%endif 
    19  
     19<br /> 
    2020% endfor 

  • trunk/loreality/loreality/templates/derived/page/pilot.html

    r2104 r2105  
    1010%endif 
    1111% if h.auth.authorized(h.auth.is_admin): 
    12 <a href=${h.url_for(controller='pilot', action='edit',id=c.pilot.id) }>[Edit]</a></li> 
     12<a href=${h.url_for(controller='pilot', action='edit',id=c.pilot.id) } class="action">[Edit]</a></li> 
    1313%endif 
    1414 

  • trunk/loreality/loreality/templates/derived/page/squadron.html

    r2104 r2105  
    44 
    55<h2>${c.squadron.name}</h2> 
     6<h3>Description</h3> 
    67<p>Plane is ${c.squadron.plane}</p> 
     8<h3>Pilots</h3> 
    79% for pilot in c.squadron.pilots: 
    810    <li><a href=${h.url_for(controller='pilot', action='view',id=pilot.id) }>${pilot.name}</a> 
    911    %if h.auth.authorized(h.auth.is_leader): 
    10     <a href=${h.url_for(pilotid=pilot.id, controller='squadron', action='removepilot',id=c.squadron.id) }>[Remove]</a></li> 
     12    <a href=${h.url_for(pilotid=pilot.id, controller='squadron', action='removepilot',id=c.squadron.id) } class="action">[Remove]</a></li> 
    1113    %endif 
    1214% endfor 
    1315% if h.auth.authorized(h.auth.is_leader): 
    1416${campaign.add_pilot_to_squadron(c.squadron.id, c.available_pilots)} 
    15 <a href=${h.url_for(controller='squadron', action='edit',id=c.squadron.id) }>[Edit]</a></li> 
     17<a href=${h.url_for(controller='squadron', action='edit',id=c.squadron.id) } class="action">[Edit]</a></li> 
    1618%endif 
    17 <a href=${h.url_for(controller='squadron', action='index') }>[All squadron]</a></li> 
     19<hr /> 
     20<a href=${h.url_for(controller='squadron', action='index') } class="action">[All squadron]</a></li> 
    1821 
Note: See TracChangeset for help on using the changeset viewer.