Fossil

Check-in [f83e0d21]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Lines now go directly from directories to child nodes, do not pass go, do not collect $200.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | csstree
Files: files | file ages | folders
SHA1:f83e0d21235d325e766576714408e413c6060e1f
User & Date: joel 2014-01-06 02:36:50
Context
2014-01-06
03:19
Merge in the csstree branch, providing a better look and more control over the tree-view. check-in: 1264375b user: drh tags: trunk
02:36
Lines now go directly from directories to child nodes, do not pass go, do not collect $200. Closed-Leaf check-in: f83e0d21 user: joel tags: csstree
2014-01-05
21:43
Add horizontal lines connecting nodes to their parent directory. check-in: 19a8ce37 user: joel tags: csstree
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/browse.c.

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
...
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
    @ %s(blob_str(&dirname))</h2>
  }


  /* Generate a multi-column table listing the contents of zD[]
  ** directory.
  */
  @ <ul class="filetree root">
  if( nD ){
    char *zLink = href("%s", url_render(&sURI, "name", 0, 0, 0));
    @ <li class="dir">
    @ %z(zLink)%h(zProjectName)</a>
  }else{
    @ <li class="dir subdir">
    @ <a>%h(zProjectName)</a>
  }
  @ <ul class="filetree">
  for(p=sTree.pFirst; p; p=p->pNext){
    if( p->isDir ){
      if( nD && strlen(p->zFullName)==nD-1 ){
        @ <li class="dir subdir">
      }else{
        @ <li class="dir">
      }
      if( fossil_strcmp(p->zFullName, zD)==0 ){
        @ <a>%h(p->zName)</a>
      }else{
        char *zLink = href("%s", url_render(&sURI, "name", p->zFullName, 0, 0));
        @ %z(zLink)%h(p->zName)</a>
      }
      @ <ul class="filetree">
    }else{
      char *zLink;
      if( zCI ){
        zLink = href("%R/artifact/%s",p->zUuid);
      }else{
        zLink = href("%R/finfo?name=%T",p->zFullName);
      }
................................................................................
      int nClose = p->iLevel - (p->pNext ? p->pNext->iLevel : 0);
      while( nClose-- > 0 ){
        @ </ul>
      }
    }
  }
  @ </ul>
  @ </ul>
  style_footer();

  /* We could free memory used by sTree here if we needed to.  But
  ** the process is about to exit, so doing so would not really accomplish
  ** anything useful. */
}








|








|













|







 







|







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
...
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
    @ %s(blob_str(&dirname))</h2>
  }


  /* Generate a multi-column table listing the contents of zD[]
  ** directory.
  */
  @ <div class="filetree"><ul>
  if( nD ){
    char *zLink = href("%s", url_render(&sURI, "name", 0, 0, 0));
    @ <li class="dir">
    @ %z(zLink)%h(zProjectName)</a>
  }else{
    @ <li class="dir subdir">
    @ <a>%h(zProjectName)</a>
  }
  @ <ul>
  for(p=sTree.pFirst; p; p=p->pNext){
    if( p->isDir ){
      if( nD && strlen(p->zFullName)==nD-1 ){
        @ <li class="dir subdir">
      }else{
        @ <li class="dir">
      }
      if( fossil_strcmp(p->zFullName, zD)==0 ){
        @ <a>%h(p->zName)</a>
      }else{
        char *zLink = href("%s", url_render(&sURI, "name", p->zFullName, 0, 0));
        @ %z(zLink)%h(p->zName)</a>
      }
      @ <ul>
    }else{
      char *zLink;
      if( zCI ){
        zLink = href("%R/artifact/%s",p->zUuid);
      }else{
        zLink = href("%R/finfo?name=%T",p->zFullName);
      }
................................................................................
      int nClose = p->iLevel - (p->pNext ? p->pNext->iLevel : 0);
      while( nClose-- > 0 ){
        @ </ul>
      }
    }
  }
  @ </ul>
  @ </ul></div>
  style_footer();

  /* We could free memory used by sTree here if we needed to.  But
  ** the process is about to exit, so doing so would not really accomplish
  ** anything useful. */
}

Changes to src/style.c.

770
771
772
773
774
775
776
777
778
779
780
781
782
783
784

785
786
787
788
789
790
791

792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811

812














813
814
815
816
817

818
819
820
821
822
823


824
825
826
827
828
829
830
831
832
833
834
  { "ul.browser",
    "format for the list in the file browser",
    @   margin-left: 0.5em;
    @   padding-left: 0.5em;
    @   white-space: nowrap;
  },
  { ".filetree",
    "file tree root and branch lists",
    @   display: inline;
    @   padding: 0;
  },
  { ".filetree.root",
    "file tree root",
    @   display: block;
    @   list-style: none;

  },
  { ".filetree li",
    "file tree list items",
    @   display: inline;
  },
  { ".filetree .subdir ul",
    "file tree lists below subdir",

    @   display: block;
    @   margin: 0 0 .5em 7px;
    @   padding: .2em 0 0 12px;
    @   border-left: 2px solid #ccc;
  },
  { ".filetree .subdir li",
    "file tree lists items below subdir",
    @   position: relative;
    @   display: block;
    @   margin: .2em 0;
    @   padding: 0;
  },
  { ".filetree .subdir li:before",
    "file tree horizontal lines connecting children to parent",
    @   content: '';
    @   position: absolute;
    @   top: .5em;
    @   left: -12px;
    @   margin-top: 1px;
    @   width: 10px;

    @   border-top: 2px solid #ccc;














  },
  { ".filetree a",
    "file tree links",
    @   margin-right: .5em;
  },

  { ".filetree a:before",
    "file tree link icons",
    @   margin-right: 5px;
    @   line-height: 0;
    @   vertical-align: -3px;
    @   content: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP\/\/\/yEhIf\/\/\/wAAACH5BAEHAAIALAAAAAAQABAAAAIvlIKpxqcfmgOUvoaqDSCxrEEfF14GqFXImJZsu73wepJzVMNxrtNTj3NATMKhpwAAOw==);


  },
  { ".filetree .dir > a:before",
    "file tree directory link icons",
    @   content: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP/WVCIiIv\/\/\/wAAACH5BAEHAAIALAAAAAAQABAAAAInlI9pwa3XYniCgQtkrAFfLXkiFo1jaXpo+jUs6b5Z/K4siDu5RPUFADs=);
  },
  { "table.login_out",
    "table format for login/out label/input table",
    @   text-align: left;
    @   margin-right: 10px;
    @   margin-left: 10px;
    @   margin-top: 10px;







|
|
|

|
|
|
|
>







>

|
|
<





|



|


|
|
<
|
>
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>



|
<
>
|
|
|
|
<
|
>
>

|
|
|







770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796

797
798
799
800
801
802
803
804
805
806
807
808
809
810

811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831

832
833
834
835
836

837
838
839
840
841
842
843
844
845
846
847
848
849
850
  { "ul.browser",
    "format for the list in the file browser",
    @   margin-left: 0.5em;
    @   padding-left: 0.5em;
    @   white-space: nowrap;
  },
  { ".filetree",
    "",
    @   margin: 1em 0;
    @   line-height: 1.5;
  },
  { ".filetree ul",
    "file tree lists",
    @   display: inline;
    @   margin: 0;
    @   padding: 0;
  },
  { ".filetree li",
    "file tree list items",
    @   display: inline;
  },
  { ".filetree .subdir ul",
    "file tree lists below subdir",
    @   position: relative;
    @   display: block;
    @   margin: 0 0 0 21px;
    @   padding: 0;

  },
  { ".filetree .subdir li",
    "file tree lists items below subdir",
    @   position: relative;
    @   display: block;
    @   margin: 0;
    @   padding: 0;
  },
  { ".filetree .subdir li:before",
    "file tree node lines",
    @   content: '';
    @   position: absolute;
    @   top: -.8em;
    @   left: -14px;

    @   width: 14px;
    @   height: 1.5em;
    @   border-left: 2px solid #aaa;
    @   border-bottom: 2px solid #aaa;
  },
  { ".filetree .subdir > ul ul:before",
    "file tree directory lines",
    @   content: '';
    @   position: absolute;
    @   top: -1.5em;
    @   bottom: 0;
    @   left: -35px;
    @   border-left: 2px solid #aaa;
  },
  { ".filetree .subdir li:last-child > ul:before",
    "",
    @   display: none;
  },
  { ".filetree a",
    "file tree links",
    @   position: relative;

    @   z-index: 1;
    @   display: inline-block;
    @   min-height: 16px;
    @   margin-right: .5em;
    @   padding-left: 21px;

    @   background-image: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP\/\/\/yEhIf\/\/\/wAAACH5BAEHAAIALAAAAAAQABAAAAIvlIKpxqcfmgOUvoaqDSCxrEEfF14GqFXImJZsu73wepJzVMNxrtNTj3NATMKhpwAAOw==);
    @   background-position: center left;
    @   background-repeat: no-repeat;
  },
  { ".filetree .dir > a",
    "file tree directory link",
    @   background-image: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP/WVCIiIv\/\/\/wAAACH5BAEHAAIALAAAAAAQABAAAAInlI9pwa3XYniCgQtkrAFfLXkiFo1jaXpo+jUs6b5Z/K4siDu5RPUFADs=);
  },
  { "table.login_out",
    "table format for login/out label/input table",
    @   text-align: left;
    @   margin-right: 10px;
    @   margin-left: 10px;
    @   margin-top: 10px;