patch of appview/pages: move topbar and footer into fragments · round #0 · pull #533 · tangled.org/core

+2 -2

appview/pages/templates/layouts/base.html

···

       17
        
               <body class="min-h-screen grid grid-cols-1 grid-rows-[min-content_auto_min-content] md:grid-cols-12 gap-4 bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200">

     

       18
        
                 {{ block "topbarLayout" . }}

     

       19
        
                   <header class="px-1 col-span-1 md:col-start-3 md:col-span-8" style="z-index: 20;">

     

       20
       -
                     {{ template "layouts/topbar" . }}

     

       21
        
                   </header>

     

       22
        
                 {{ end }}

     

       23
        
       

     
···

       39
        
       

     

       40
        
                 {{ block "footerLayout" . }}

     

       41
        
                   <footer class="px-1 col-span-1 md:col-start-3 md:col-span-8 mt-12">

     

       42
       -
                     {{ template "layouts/footer" . }}

     

       43
        
                   </footer>

     

       44
        
                 {{ end }}

     

       45
        
               </body>

···

       17
        
               <body class="min-h-screen grid grid-cols-1 grid-rows-[min-content_auto_min-content] md:grid-cols-12 gap-4 bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200">

     

       18
        
                 {{ block "topbarLayout" . }}

     

       19
        
                   <header class="px-1 col-span-1 md:col-start-3 md:col-span-8" style="z-index: 20;">

     

       20
       +
                     {{ template "layouts/fragments/topbar" . }}

     

       21
        
                   </header>

     

       22
        
                 {{ end }}

     

       23
        
       

     
···

       39
        
       

     

       40
        
                 {{ block "footerLayout" . }}

     

       41
        
                   <footer class="px-1 col-span-1 md:col-start-3 md:col-span-8 mt-12">

     

       42
       +
                     {{ template "layouts/fragments/footer" . }}

     

       43
        
                   </footer>

     

       44
        
                 {{ end }}

     

       45
        
               </body>

+1 -1

appview/pages/templates/layouts/footer.html appview/pages/templates/layouts/fragments/footer.html

···

       1
       -
       {{ define "layouts/footer" }}

     

       2
        
       <div class="w-full p-4 md:p-8 bg-white dark:bg-gray-800 rounded-t drop-shadow-sm">

     

       3
        
         <div class="container mx-auto max-w-7xl px-4">

     

       4
        
           <div class="flex flex-col lg:flex-row justify-between items-start text-gray-600 dark:text-gray-400 text-sm gap-8">

···

       1
       +
       {{ define "layouts/fragments/footer" }}

     

       2
        
       <div class="w-full p-4 md:p-8 bg-white dark:bg-gray-800 rounded-t drop-shadow-sm">

     

       3
        
         <div class="container mx-auto max-w-7xl px-4">

     

       4
        
           <div class="flex flex-col lg:flex-row justify-between items-start text-gray-600 dark:text-gray-400 text-sm gap-8">

+1 -1

appview/pages/templates/layouts/topbar.html appview/pages/templates/layouts/fragments/topbar.html

···

       1
       -
       {{ define "layouts/topbar" }}

     

       2
        
           <nav class="space-x-4 px-6 py-2 rounded bg-white dark:bg-gray-800 dark:text-white drop-shadow-sm">

     

       3
        
               <div class="flex justify-between p-0 items-center">

     

       4
        
                   <div id="left-items">

···

       1
       +
       {{ define "layouts/fragments/topbar" }}

     

       2
        
           <nav class="space-x-4 px-6 py-2 rounded bg-white dark:bg-gray-800 dark:text-white drop-shadow-sm">

     

       3
        
               <div class="flex justify-between p-0 items-center">

     

       4
        
                   <div id="left-items">

+2 -2

appview/pages/templates/repo/commit.html

···

       81
        
       

     

       82
        
       {{ define "topbarLayout" }}

     

       83
        
         <header class="px-1 col-span-full" style="z-index: 20;">

     

       84
       -
           {{ template "layouts/topbar" . }}

     

       85
        
         </header>

     

       86
        
       {{ end }}

     

       87
        
       

     
···

       106
        
       

     

       107
        
       {{ define "footerLayout" }}

     

       108
        
         <footer class="px-1 col-span-full mt-12">

     

       109
       -
           {{ template "layouts/footer" . }}

     

       110
        
         </footer>

     

       111
        
       {{ end }}

     

       112

···

       81
        
       

     

       82
        
       {{ define "topbarLayout" }}

     

       83
        
         <header class="px-1 col-span-full" style="z-index: 20;">

     

       84
       +
           {{ template "layouts/fragments/topbar" . }}

     

       85
        
         </header>

     

       86
        
       {{ end }}

     

       87
        
       

     
···

       106
        
       

     

       107
        
       {{ define "footerLayout" }}

     

       108
        
         <footer class="px-1 col-span-full mt-12">

     

       109
       +
           {{ template "layouts/fragments/footer" . }}

     

       110
        
         </footer>

     

       111
        
       {{ end }}

     

       112

+2 -2

appview/pages/templates/repo/compare/compare.html

···

       12
        
       

     

       13
        
       {{ define "topbarLayout" }}

     

       14
        
         <header class="px-1 col-span-full" style="z-index: 20;">

     

       15
       -
           {{ template "layouts/topbar" . }}

     

       16
        
         </header>

     

       17
        
       {{ end }}

     

       18
        
       

     
···

       37
        
       

     

       38
        
       {{ define "footerLayout" }}

     

       39
        
         <footer class="px-1 col-span-full mt-12">

     

       40
       -
           {{ template "layouts/footer" . }}

     

       41
        
         </footer>

     

       42
        
       {{ end }}

     

       43

···

       12
        
       

     

       13
        
       {{ define "topbarLayout" }}

     

       14
        
         <header class="px-1 col-span-full" style="z-index: 20;">

     

       15
       +
           {{ template "layouts/fragments/topbar" . }}

     

       16
        
         </header>

     

       17
        
       {{ end }}

     

       18
        
       

     
···

       37
        
       

     

       38
        
       {{ define "footerLayout" }}

     

       39
        
         <footer class="px-1 col-span-full mt-12">

     

       40
       +
           {{ template "layouts/fragments/footer" . }}

     

       41
        
         </footer>

     

       42
        
       {{ end }}

     

       43

+2 -2

appview/pages/templates/repo/pulls/interdiff.html

···

       30
        
       

     

       31
        
       {{ define "topbarLayout" }}

     

       32
        
         <header class="px-1 col-span-full" style="z-index: 20;">

     

       33
       -
           {{ template "layouts/topbar" . }}

     

       34
        
         </header>

     

       35
        
       {{ end }}

     

       36
        
       

     
···

       55
        
       

     

       56
        
       {{ define "footerLayout" }}

     

       57
        
         <footer class="px-1 col-span-full mt-12">

     

       58
       -
           {{ template "layouts/footer" . }}

     

       59
        
         </footer>

     

       60
        
       {{ end }}

     

       61

···

       30
        
       

     

       31
        
       {{ define "topbarLayout" }}

     

       32
        
         <header class="px-1 col-span-full" style="z-index: 20;">

     

       33
       +
           {{ template "layouts/fragments/topbar" . }}

     

       34
        
         </header>

     

       35
        
       {{ end }}

     

       36
        
       

     
···

       55
        
       

     

       56
        
       {{ define "footerLayout" }}

     

       57
        
         <footer class="px-1 col-span-full mt-12">

     

       58
       +
           {{ template "layouts/fragments/footer" . }}

     

       59
        
         </footer>

     

       60
        
       {{ end }}

     

       61

+2 -2

appview/pages/templates/repo/pulls/patch.html

···

       36
        
       

     

       37
        
       {{ define "topbarLayout" }}

     

       38
        
         <header class="px-1 col-span-full" style="z-index: 20;">

     

       39
       -
           {{ template "layouts/topbar" . }}

     

       40
        
         </header>

     

       41
        
       {{ end }}

     

       42
        
       

     
···

       61
        
       

     

       62
        
       {{ define "footerLayout" }}

     

       63
        
         <footer class="px-1 col-span-full mt-12">

     

       64
       -
           {{ template "layouts/footer" . }}

     

       65
        
         </footer>

     

       66
        
       {{ end }}

     

       67

···

       36
        
       

     

       37
        
       {{ define "topbarLayout" }}

     

       38
        
         <header class="px-1 col-span-full" style="z-index: 20;">

     

       39
       +
           {{ template "layouts/fragments/topbar" . }}

     

       40
        
         </header>

     

       41
        
       {{ end }}

     

       42
        
       

     
···

       61
        
       

     

       62
        
       {{ define "footerLayout" }}

     

       63
        
         <footer class="px-1 col-span-full mt-12">

     

       64
       +
           {{ template "layouts/fragments/footer" . }}

     

       65
        
         </footer>

     

       66
        
       {{ end }}

     

       67

-4

appview/pages/templates/strings/put.html

···

       1
        
       {{ define "title" }}publish a new string{{ end }}

     

       2
        
       

     

       3
       -
       {{ define "topbar" }}

     

       4
       -
         {{ template "layouts/topbar" $ }}

     

       5
       -
       {{ end }}

     

       6
       -
       

     

       7
        
       {{ define "content" }}

     

       8
        
         <div class="px-6 py-2 mb-4">

     

       9
        
           {{ if eq .Action "new" }}

···

       1
        
       {{ define "title" }}publish a new string{{ end }}

     

       2
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       3
        
       {{ define "content" }}

     

       4
        
         <div class="px-6 py-2 mb-4">

     

       5
        
           {{ if eq .Action "new" }}

-4

appview/pages/templates/strings/string.html

···

       8
        
         <meta property="og:description" content="{{ .String.Description }}" />

     

       9
        
       {{ end }}

     

       10
        
       

     

       11
       -
       {{ define "topbar" }}

     

       12
       -
         {{ template "layouts/topbar" $ }}

     

       13
       -
       {{ end }}

     

       14
       -
       

     

       15
        
       {{ define "content" }}

     

       16
        
       {{ $ownerId := didOrHandle .Owner.DID.String .Owner.Handle.String }}

     

       17
        
         <section id="string-header" class="mb-4 py-2 px-6 dark:text-white">

···

       8
        
         <meta property="og:description" content="{{ .String.Description }}" />

     

       9
        
       {{ end }}

     

       10
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       11
        
       {{ define "content" }}

     

       12
        
       {{ $ownerId := didOrHandle .Owner.DID.String .Owner.Handle.String }}

     

       13
        
         <section id="string-header" class="mb-4 py-2 px-6 dark:text-white">

-4

appview/pages/templates/strings/timeline.html

···

       1
        
       {{ define "title" }} all strings {{ end }}

     

       2
        
       

     

       3
       -
       {{ define "topbar" }}

     

       4
       -
         {{ template "layouts/topbar" $ }}

     

       5
       -
       {{ end }}

     

       6
       -
       

     

       7
        
       {{ define "content" }}

     

       8
        
         {{ block "timeline" $ }}{{ end }}

     

       9
        
       {{ end }}

···

       1
        
       {{ define "title" }} all strings {{ end }}

     

       2
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       3
        
       {{ define "content" }}

     

       4
        
         {{ block "timeline" $ }}{{ end }}

     

       5
        
       {{ end }}