Merge branch 'goibhniu' of git://git.pipapo.org/mob/webgit
authorChristian Thaeter <ct@pipapo.org>
Thu, 24 Jan 2008 10:15:24 +0000 (11:15 +0100)
committerChristian Thaeter <ct@pipapo.org>
Thu, 24 Jan 2008 10:15:24 +0000 (11:15 +0100)
* 'goibhniu' of git://git.pipapo.org/mob/webgit:
  was missing content for the summary
  was missing content id for log.c
  adjusting the font on the content area
  tidy up the css a bit
  tidy up the css a bit
  tidy up the css a bit
  tidy up the css a bit
  sub-menu should have been an id .. adding content id too for the main content area
  forget the 100% width for now .. maybe there's a sensible way
  doing excessive css to use both a 100% width table and a sidebar .... I guess it's ok as an example
  adding summary container id to move the summary table to the right
  moved the sidebar to the left
  added sub-menu class for the sidebar
  tweaked main-menu and footer
  Right aligned header
  horizontal li menu example
  didn't work
  adding simple sample menu and heading style and footer blurb
  adding simple sample menu and heading style and footer blurb
  moving skins folder

Conflicts:

src/actions.c

1  2 
skins/default/css/webgit.css
skins/default/inc/footer.inc
skins/default/inc/header.inc
src/actions.c

Simple merge
Simple merge
Simple merge
diff --cc src/actions.c
@@@ -84,66 -84,67 +84,70 @@@ webgit_main_content_action (struct webg
  
        webgit_repoinfo_find_last (n);
  
 -      html_list_append (table, html (
 -                                     /*
 -                                       It would be great to have alternate rows with class="odd" or class="even"
 -                                       html_tag ("tr", html_attr ("class", "odd")),
 -                                      */
 -                                     html_tag ("tr"),
 -                                     html(html_tag ("td"),
 -                                          webgit_summary_link (query, n, html (n->name))),
 -                                     html(html_tag ("td"), n->url ?
 -                                          html (
 -                                                html_tag ("a", html_attr ("href", n->url)),
 -                                                n->url)
 -                                          : html("N/A")
 -                                          ),
 -                                     html(html_tag ("td"), n->description),
 -                                     html(html_tag ("td"), n->owner),
 -                                     html(html_tag ("td"),
 -                                          webgit_object_link (query,
 -                                                              n->name, strlen(n->name),
 -                                                              n->last_commit, 40,
 -                                                              NULL,
 -                                                              NULL,
 -                                                              webgit_pretty_age (n->age))
 -                                          ),
 -                                     html(html_tag ("td"),
 -                                          webgit_email_link (
 -                                                             html (n->last_author_name),
 -                                                             html (n->last_author_email)
 -                                                             )
 -                                          ),
 -                                     html(html_tag ("td"),
 -                                          webgit_email_link (
 -                                                             html (n->last_committer_name),
 -                                                             html (n->last_committer_email)
 -                                                             )
 -                                          ),
 -                                     html(html_tag ("td"),
 -                                          html(
 -                                               webgit_log_link (query,
 -                                                                n->name,
 -                                                                n->last_head,
 -                                                                NULL, 0,
 -                                                                query->count,
 -                                                                html("Log")
 -                                                                ),
 -                                               " ",
 -
 -                                               "Diff ",
 -                                               //webgit_diff_link (query, n, n->last_head, html("Diff")),
 -                                               //" ",
 -                                               webgit_object_link (query,
 -                                                                   n->name, strlen(n->name),
 -                                                                   n->last_tree, 40,
 -                                                                   NULL,
 -                                                                   NULL,
 -                                                                   html("Tree"))
 -                                               )
 -                                          )
 -                                     ),
 -                        html_nl()
 -                        );
 +      if (n->age < n->maxage)
 +        {
 +          html_list_append (table, html (
++                                         /*
++                                           TODO:
++                                           It would be great to have alternate rows with class="odd" or class="even"
++                                           html_tag ("tr", html_attr ("class", "odd")),
++                                         */
 +                                         html_tag ("tr"),
 +                                         html(html_tag ("td"),
 +                                              webgit_summary_link (query, n, html (n->name))),
 +                                         html(html_tag ("td"), n->url ?
 +                                              html (
 +                                                    html_tag ("a", html_attr ("href", n->url)),
 +                                                    n->url)
 +                                              : html("N/A")
 +                                              ),
 +                                         html(html_tag ("td"), n->description),
 +                                         html(html_tag ("td"), n->owner),
 +                                         html(html_tag ("td"),
 +                                              webgit_object_link (query,
 +                                                                  n->name, strlen(n->name),
 +                                                                  n->last_commit, 40,
 +                                                                  NULL,
 +                                                                  NULL,
 +                                                                  webgit_pretty_age (n->age))
 +                                              ),
 +                                         html(html_tag ("td"),
 +                                              webgit_email_link (
 +                                                                 html (n->last_author_name),
 +                                                                 html (n->last_author_email)
 +                                                                 )
 +                                              ),
 +                                         html(html_tag ("td"),
 +                                              webgit_email_link (
 +                                                                 html (n->last_committer_name),
 +                                                                 html (n->last_committer_email)
 +                                                                 )
 +                                              ),
 +                                         html(html_tag ("td"),
 +                                              html(
 +                                                   webgit_log_link (query,
 +                                                                    n->name,
 +                                                                    n->last_head,
 +                                                                    NULL, 0,
 +                                                                    query->count,
 +                                                                    html("Log")
 +                                                                    ),
 +                                                   " ",
 +                                                   "Diff ",
 +                                                   //webgit_diff_link (query, n, n->last_head, html("Diff")),
 +                                                   //" ",
 +                                                   webgit_object_link (query,
 +                                                                       n->name, strlen(n->name),
 +                                                                       n->last_tree, 40,
 +                                                                       NULL,
 +                                                                       NULL,
 +                                                                       html("Tree"))
 +                                                   )
 +                                              )
 +                                         ),
 +                            html_nl()
 +                            );
 +        }
      }
  
    return html (html_tag ("table", html_attr ("id", "summary")), table);
@@@ -153,9 -154,12 +157,13 @@@ static Htm
  webgit_main_action (struct webgit_query* query)
  {
    return html(
-               html(html_tag("div", html_attr("id", "header-action")), webgit_header_action (query)), html_nl (),
-               html(html_tag("div", html_attr("id", "main-menu")), webgit_main_menu_action (query)), html_nl (),
-               html(html_tag("div"), webgit_main_content_action (query)), html_nl ()
+               html(html_tag("div", html_attr("id", "sub-menu")), webgit_header_action (query)), html_nl (),
+               /*
++                TODO:
+                 I'm not sure if we need this? Is the sub-menu sufficient?
+                 html(html_tag("div"), webgit_main_menu_action (query)), html_nl (), 
+               */
+               html(html_tag("div", html_attr("id", "content")), webgit_main_content_action (query)), html_nl ()
                );
  }
  
@@@ -450,7 -455,7 +459,7 @@@ webgit_config_action (struct webgit_que
    if (query->blob)
      {
        FILE* cfg = fopen (git_path ("config"), "w");
-- 
++
        /*TODO rxpd check */
        if (!cfg)
          webgit_warn ("could not open %s for writing", git_path("config"));