MobileBlur

Check-in [f6c84eb8e3]
Login

Check-in [f6c84eb8e3]

Overview
Comment:Accidentally made a few commits in trunk instead of develop
Timelines: family | ancestors | develop
Files: files | file ages | folders
SHA1: f6c84eb8e30793fe1824b27292607c39503237bc
User & Date: spiffy on 2011-12-03 12:55:22.735
Other Links: branch diff | manifest | tags
Context
2011-12-03
12:55
Accidentally made a few commits in trunk instead of develop Leaf check-in: f6c84eb8e3 user: spiffy tags: develop
12:54
Minor changes to the layout Leaf check-in: bddb3e05ed user: spiffy tags: trunk, v0.5
2011-11-30
02:49
Made the story title in the story view nicely styled. Put the 'mark story read' button inside the header check-in: dea6297b3d user: spiffy tags: develop, v0.4
Changes
Unified Diff Ignore Whitespace Patch
Modified applications/mobileblur/static/css/base.css from [c4d6d0ed8b] to [e5c27c75f9].
︙︙
512
513
514
515
516
517
518
519
520
521







522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553

554


555
556





557
558
559
560
561
562


563

564

565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594

  tr, img { page-break-inside: avoid; }
  @page { margin: 0.5cm; }
  p, h2, h3 { orphans: 3; widows: 3; }
  h2, h3{ page-break-after: avoid; }
}

body {
/*    background-color: #f2c84b;*/
    color: #493F3E
}








header {
    background-color: #95392E;
    padding: 1%;
    border-bottom: 1px solid #95392E;
    color: white;
}
header > h1 > a {
    text-decoration: none;
    color: white;
    font-weight: bold;
}

#story > header > a {
    color: white;
}

header > a> h2 {
/*    border-top: 1px solid white;*/
    color: white;
}

#story-list {
/*    background-color: #f2c84b;*/
}

#story-list > .story > a, .feed > a {
    text-decoration: none;
    font-weight: bold;
    margin-top: 0;
}
#story-list > .story > p {

    font-size: .75em;


}






#story-list > .story > .read {
    color: #D99B48;
}
#story-list > .story > .unread, .feed > a {
    color: #C57E3C;
}




#story-list > .story, .feed {

    padding: .5%;
    border-top: 1px solid #95392E;
    margin-top: .33%;
}

span.ps, span.nt, span.ng {
    padding: .05em;
    border-radius: 5px;
}
span.ps {
    background-color: #ABAA7A;
}
span.nt {
    background-color: #D99B48;
}
span.ng {
    background-color: red;
}

footer {
    background-color: #95392E;
    padding: 1%;
    border-top: 1px solid #95392E;
    color: white;
}
footer > a {
    text-decoration: none;
    color: white;
    font-weight: bold;
}








<


>
>
>
>
>
>
>



<













|








|
|



|
>

>
>


>
>
>
>
>
|


|


>
>
|
>
|
>
|




















<



|





512
513
514
515
516
517
518

519
520
521
522
523
524
525
526
527
528
529
530

531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602

603
604
605
606
607
608
609
610

  tr, img { page-break-inside: avoid; }
  @page { margin: 0.5cm; }
  p, h2, h3 { orphans: 3; widows: 3; }
  h2, h3{ page-break-after: avoid; }
}

body {

    color: #493F3E
}
#content {
    padding: 0 0.5% 0 0.5%;
}

a, a:hover {
    text-decoration: none;
}

header {
    background-color: #95392E;

    border-bottom: 1px solid #95392E;
    color: white;
}
header > h1 > a {
    text-decoration: none;
    color: white;
    font-weight: bold;
}

#story > header > a {
    color: white;
}

header h2 {
/*    border-top: 1px solid white;*/
    color: white;
}

#story-list {
/*    background-color: #f2c84b;*/
}

#story-list a, .feed {
    padding: 0.5% 0 0.5% 0;
    font-weight: bold;
    margin-top: 0;
}

.story-date {
    font-size: .75em;
    color: #493F3E;
    font-weight: normal;
}

.feed {
    color: white;
    text-decoration: none;
}

.read {
    color: #D99B48;
}
.unread, .feed .feed-title {
    color: #C57E3C;
}
.ng, .nt, .ps {
    color: #493F3E;
}

#story-list .story, .feed {
    text-decoration: none;
    padding: .5 0 .5% 0%;
    border-top: 1px solid #95392E;
    margin-top: .33%;
}

span.ps, span.nt, span.ng {
    padding: .05em;
    border-radius: 5px;
}
span.ps {
    background-color: #ABAA7A;
}
span.nt {
    background-color: #D99B48;
}
span.ng {
    background-color: red;
}

footer {
    background-color: #95392E;

    border-top: 1px solid #95392E;
    color: white;
}
footer a {
    text-decoration: none;
    color: white;
    font-weight: bold;
}
Modified applications/mobileblur/views/default/index.html from [de8ac0789f] to [2d4e4818bd]. 
1
2
3

4
5
6
7
8
9

10

{{extend 'layout.html'}}

{{ for feed in feeds.itervalues(): }}

    <div class="feed">
        {{ if threshold == -1 and feed["ng"] > 0: }} <span class='ng'>{{= feed["ng"] }}</span> {{ pass }}
        {{ if threshold <= 0 and feed["nt"] > 0: }} <span class='nt'>{{= feed["nt"] }}</span> {{ pass }}
        {{if feed["ps"] > 0: }}<span class='ps'>{{= feed["ps"] }}</span> {{ pass }}
        <a href="{{= URL(c="feeds", f="view", args=[feed["id"]]) }}">{{= feed["feed_title"] }}</a><br />
    </div>

{{ pass }}




>
|
|
|
|
|
|
>


1
2
3
4
5
6
7
8
9
10
11
12

{{extend 'layout.html'}}

{{ for feed in feeds.itervalues(): }}
    <a href="{{= URL(c="feeds", f="view", args=[feed["id"]]) }}">
        <div class="feed">
            {{ if threshold == -1 and feed["ng"] > 0: }} <span class='ng'>{{= feed["ng"] }}</span> {{ pass }}
            {{ if threshold <= 0 and feed["nt"] > 0: }} <span class='nt'>{{= feed["nt"] }}</span> {{ pass }}
            {{if feed["ps"] > 0: }}<span class='ps'>{{= feed["ps"] }}</span> {{ pass }}
            <span class="feed-title">{{= feed["feed_title"] }}</span>
        </div>
    </a>
{{ pass }}
Modified applications/mobileblur/views/feeds/view.html from [6526673ca3] to [a70d7ea9da]. 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25

26
27
28

{{extend 'layout.html'}}

{{ block header_bonus }}
    <h2>{{= feed["feed_title"] }}</h2>
    <a href="{{= URL("mark_read", args=[feed["id"]]) }}" class="button">Mark feed as read</a>
{{ end }}

<section id="story-list">
{{
import time 
s = time.time()
}}
    {{ 
        for story in stories: 
        if sum([v for k,v in story["intelligence"].iteritems()]) < threshold:
            continue
    }}

        {{ print story["read_status"] }}
        <div class="story">
            <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" }}">
                {{= story["story_title"] }}
            </a>
            <p>{{= story["story_date"] }}</p>
        </div>

    {{ pass }}
{{ print time.time() - s }}
</section>









<
<
<
<






|
|
|
<
<
|
|
>

<


1
2
3
4
5
6
7
8




9
10
11
12
13
14
15
16
17


18
19
20
21

22

{{extend 'layout.html'}}

{{ block header_bonus }}
    <h2>{{= feed["feed_title"] }}</h2>
    <a href="{{= URL("mark_read", args=[feed["id"]]) }}" class="button">Mark feed as read</a>
{{ end }}

<section id="story-list">




    {{ 
        for story in stories: 
        if sum([v for k,v in story["intelligence"].iteritems()]) < threshold:
            continue
    }}

        <a href="{{= URL(c="stories", f="view", vars=dict(story=story["id"], feed_id=feed["id"])) }}" }}">
            <div class="story">
                <p class="story-title {{= "unread" if story["read_status"] == 0 else "read" }}">{{= story["story_title"] }}</p>


                <p class="story-date">{{= story["story_date"] }}</p>
            </div>
        </a>
    {{ pass }}

</section>
Modified applications/mobileblur/views/layout.html from [2dc8430c3d] to [79485da9a7].
︙︙
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89

    else: width_content='100%'
    if left_sidebar_enabled: left_sidebar_style = 'style="display: block;"'
    else: left_sidebar_style = 'style="display: none;"'
    if right_sidebar_enabled: right_sidebar_style = 'style="display: block;"'
    else: right_sidebar_style = 'style="display: none;"'
    style_content = 'style="width: %s"' % width_content
    }}
<!--    <link rel="stylesheet" href="http://twitter.github.com/bootstrap/1.4.0/bootstrap.min.css">-->
    <link rel="stylesheet" href="{{= URL("static", "css/1140.css") }}">
  </head>
  
  <!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->	
  <!--[if lt IE 7 ]> <body class="ie6"> <![endif]-->
  <!--[if IE 7 ]>    <body class="ie7"> <![endif]-->
  <!--[if IE 8 ]>    <body class="ie8"> <![endif]-->
  <!--[if IE 9 ]>    <body class="ie9"> <![endif]-->
  <!--[if (gt IE 9)|!(IE)]><!--> <body> <!--<![endif]-->
    
    <div class="flash">{{=response.flash or ''}}</div> <!-- notification div -->
    
	<header>
	  {{block header}} <!-- this is default header -->
          <h1><a href="{{= URL("mobileblur", "default", "index") }}">MobileBlur</a></h1>
	  {{end}}
      {{ block header_bonus }}{{end}}
	</header>
	
    <section id="content" class-"container" {{=XML(style_content)}} >
        {{include}}	
    </section>

    <footer>
        <a href="{{= URL("default", "logout") }}">Log out</a>
    </footer>
    








<
<


















|








55
56
57
58
59
60
61


62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87

    else: width_content='100%'
    if left_sidebar_enabled: left_sidebar_style = 'style="display: block;"'
    else: left_sidebar_style = 'style="display: none;"'
    if right_sidebar_enabled: right_sidebar_style = 'style="display: block;"'
    else: right_sidebar_style = 'style="display: none;"'
    style_content = 'style="width: %s"' % width_content
    }}


  </head>
  
  <!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->	
  <!--[if lt IE 7 ]> <body class="ie6"> <![endif]-->
  <!--[if IE 7 ]>    <body class="ie7"> <![endif]-->
  <!--[if IE 8 ]>    <body class="ie8"> <![endif]-->
  <!--[if IE 9 ]>    <body class="ie9"> <![endif]-->
  <!--[if (gt IE 9)|!(IE)]><!--> <body> <!--<![endif]-->
    
    <div class="flash">{{=response.flash or ''}}</div> <!-- notification div -->
    
	<header>
	  {{block header}} <!-- this is default header -->
          <h1><a href="{{= URL("mobileblur", "default", "index") }}">MobileBlur</a></h1>
	  {{end}}
      {{ block header_bonus }}{{end}}
	</header>
	
    <section id="content"{{=XML(style_content)}} >
        {{include}}	
    </section>

    <footer>
        <a href="{{= URL("default", "logout") }}">Log out</a>
    </footer>
︙︙