MobileBlur

Check-in [f6c84eb8e3]
Login
Overview
SHA1:f6c84eb8e30793fe1824b27292607c39503237bc
Date: 2011-12-03 12:55:22
User: spiffy
Comment:Accidentally made a few commits in trunk instead of develop
Timelines: family | ancestors | develop
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2011-12-03
12:55
[f6c84eb8e3] Leaf: Accidentally made a few commits in trunk instead of develop (user: spiffy, tags: develop)
12:54
[bddb3e05ed] Leaf: Minor changes to the layout (user: spiffy, tags: trunk, v0.5)
2011-11-30
02:49
[dea6297b3d] Made the story title in the story view nicely styled. Put the 'mark story read' button inside the header (user: spiffy, tags: develop, v0.4)
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified applications/mobileblur/static/css/base.css from [c4d6d0ed8b] to [e5c27c75f9].

   512    512     tr, img { page-break-inside: avoid; }
   513    513     @page { margin: 0.5cm; }
   514    514     p, h2, h3 { orphans: 3; widows: 3; }
   515    515     h2, h3{ page-break-after: avoid; }
   516    516   }
   517    517   
   518    518   body {
   519         -/*    background-color: #f2c84b;*/
   520    519       color: #493F3E
   521    520   }
          521  +#content {
          522  +    padding: 0 0.5% 0 0.5%;
          523  +}
          524  +
          525  +a, a:hover {
          526  +    text-decoration: none;
          527  +}
   522    528   
   523    529   header {
   524    530       background-color: #95392E;
   525         -    padding: 1%;
   526    531       border-bottom: 1px solid #95392E;
   527    532       color: white;
   528    533   }
   529    534   header > h1 > a {
   530    535       text-decoration: none;
   531    536       color: white;
   532    537       font-weight: bold;
   533    538   }
   534    539   
   535    540   #story > header > a {
   536    541       color: white;
   537    542   }
   538    543   
   539         -header > a> h2 {
          544  +header h2 {
   540    545   /*    border-top: 1px solid white;*/
   541    546       color: white;
   542    547   }
   543    548   
   544    549   #story-list {
   545    550   /*    background-color: #f2c84b;*/
   546    551   }
   547    552   
   548         -#story-list > .story > a, .feed > a {
   549         -    text-decoration: none;
          553  +#story-list a, .feed {
          554  +    padding: 0.5% 0 0.5% 0;
   550    555       font-weight: bold;
   551    556       margin-top: 0;
   552    557   }
   553         -#story-list > .story > p {
          558  +
          559  +.story-date {
   554    560       font-size: .75em;
          561  +    color: #493F3E;
          562  +    font-weight: normal;
          563  +}
          564  +
          565  +.feed {
          566  +    color: white;
          567  +    text-decoration: none;
   555    568   }
   556    569   
   557         -#story-list > .story > .read {
          570  +.read {
   558    571       color: #D99B48;
   559    572   }
   560         -#story-list > .story > .unread, .feed > a {
          573  +.unread, .feed .feed-title {
   561    574       color: #C57E3C;
   562    575   }
          576  +.ng, .nt, .ps {
          577  +    color: #493F3E;
          578  +}
   563    579   
   564         -#story-list > .story, .feed {
   565         -    padding: .5%;
          580  +#story-list .story, .feed {
          581  +    text-decoration: none;
          582  +    padding: .5 0 .5% 0%;
   566    583       border-top: 1px solid #95392E;
   567    584       margin-top: .33%;
   568    585   }
   569    586   
   570    587   span.ps, span.nt, span.ng {
   571    588       padding: .05em;
   572    589       border-radius: 5px;
................................................................................
   579    596   }
   580    597   span.ng {
   581    598       background-color: red;
   582    599   }
   583    600   
   584    601   footer {
   585    602       background-color: #95392E;
   586         -    padding: 1%;
   587    603       border-top: 1px solid #95392E;
   588    604       color: white;
   589    605   }
   590         -footer > a {
          606  +footer a {
   591    607       text-decoration: none;
   592    608       color: white;
   593    609       font-weight: bold;
   594    610   }

Modified applications/mobileblur/views/default/index.html from [de8ac0789f] to [2d4e4818bd].

     1      1   {{extend 'layout.html'}}
     2      2   
     3      3   {{ for feed in feeds.itervalues(): }}
     4         -    <div class="feed">
     5         -        {{ if threshold == -1 and feed["ng"] > 0: }} <span class='ng'>{{= feed["ng"] }}</span> {{ pass }}
     6         -        {{ if threshold <= 0 and feed["nt"] > 0: }} <span class='nt'>{{= feed["nt"] }}</span> {{ pass }}
     7         -        {{if feed["ps"] > 0: }}<span class='ps'>{{= feed["ps"] }}</span> {{ pass }}
     8         -        <a href="{{= URL(c="feeds", f="view", args=[feed["id"]]) }}">{{= feed["feed_title"] }}</a><br />
     9         -    </div>
            4  +    <a href="{{= URL(c="feeds", f="view", args=[feed["id"]]) }}">
            5  +        <div class="feed">
            6  +            {{ if threshold == -1 and feed["ng"] > 0: }} <span class='ng'>{{= feed["ng"] }}</span> {{ pass }}
            7  +            {{ if threshold <= 0 and feed["nt"] > 0: }} <span class='nt'>{{= feed["nt"] }}</span> {{ pass }}
            8  +            {{if feed["ps"] > 0: }}<span class='ps'>{{= feed["ps"] }}</span> {{ pass }}
            9  +            <span class="feed-title">{{= feed["feed_title"] }}</span>
           10  +        </div>
           11  +    </a>
    10     12   {{ pass }}

Modified applications/mobileblur/views/feeds/view.html from [6526673ca3] to [a70d7ea9da].

     2      2   
     3      3   {{ block header_bonus }}
     4      4       <h2>{{= feed["feed_title"] }}</h2>
     5      5       <a href="{{= URL("mark_read", args=[feed["id"]]) }}" class="button">Mark feed as read</a>
     6      6   {{ end }}
     7      7   
     8      8   <section id="story-list">
     9         -{{
    10         -import time 
    11         -s = time.time()
    12         -}}
    13      9       {{ 
    14     10           for story in stories: 
    15     11           if sum([v for k,v in story["intelligence"].iteritems()]) < threshold:
    16     12               continue
    17     13       }}
    18     14   
    19         -        {{ print story["read_status"] }}
    20         -        <div class="story">
    21         -            <a href="{{= URL(c="stories", f="view", vars=dict(story=story["id"], feed_id=feed["id"])) }}" class="{{= "unread" if story["read_status"] == 0 else "read" }}">
    22         -                {{= story["story_title"] }}
    23         -            </a>
    24         -            <p>{{= story["story_date"] }}</p>
    25         -        </div>
           15  +        <a href="{{= URL(c="stories", f="view", vars=dict(story=story["id"], feed_id=feed["id"])) }}" }}">
           16  +            <div class="story">
           17  +                <p class="story-title {{= "unread" if story["read_status"] == 0 else "read" }}">{{= story["story_title"] }}</p>
           18  +                <p class="story-date">{{= story["story_date"] }}</p>
           19  +            </div>
           20  +        </a>
    26     21       {{ pass }}
    27         -{{ print time.time() - s }}
    28     22   </section>

Modified applications/mobileblur/views/layout.html from [2dc8430c3d] to [79485da9a7].

    55     55       else: width_content='100%'
    56     56       if left_sidebar_enabled: left_sidebar_style = 'style="display: block;"'
    57     57       else: left_sidebar_style = 'style="display: none;"'
    58     58       if right_sidebar_enabled: right_sidebar_style = 'style="display: block;"'
    59     59       else: right_sidebar_style = 'style="display: none;"'
    60     60       style_content = 'style="width: %s"' % width_content
    61     61       }}
    62         -<!--    <link rel="stylesheet" href="http://twitter.github.com/bootstrap/1.4.0/bootstrap.min.css">-->
    63         -    <link rel="stylesheet" href="{{= URL("static", "css/1140.css") }}">
    64     62     </head>
    65     63     
    66     64     <!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->	
    67     65     <!--[if lt IE 7 ]> <body class="ie6"> <![endif]-->
    68     66     <!--[if IE 7 ]>    <body class="ie7"> <![endif]-->
    69     67     <!--[if IE 8 ]>    <body class="ie8"> <![endif]-->
    70     68     <!--[if IE 9 ]>    <body class="ie9"> <![endif]-->
................................................................................
    75     73   	<header>
    76     74   	  {{block header}} <!-- this is default header -->
    77     75             <h1><a href="{{= URL("mobileblur", "default", "index") }}">MobileBlur</a></h1>
    78     76   	  {{end}}
    79     77         {{ block header_bonus }}{{end}}
    80     78   	</header>
    81     79   	
    82         -    <section id="content" class-"container" {{=XML(style_content)}} >
           80  +    <section id="content"{{=XML(style_content)}} >
    83     81           {{include}}	
    84     82       </section>
    85     83   
    86     84       <footer>
    87     85           <a href="{{= URL("default", "logout") }}">Log out</a>
    88     86       </footer>
    89     87