alyxb/mycorrhiza
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/master' into newtmpl

Browse Source 
# Conflicts:
#	categories/view_card.html
This commit is contained in:
Timur Ismagilov 2024-08-25 20:19:52 +03:00
commit 6b9adf1de3
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/files/files.go
View File

@ -24,7 +24,7 @@ var paths struct {
// A separate function is needed to easily know where a general storage path is // A separate function is needed to easily know where a general storage path is
// needed rather than a concrete Git or the whole wiki storage path, so that we // needed rather than a concrete Git or the whole wiki storage path, so that we
// could easily refactor things later if we'll ever support different storages. // could easily refactor things later if we'll ever support different storages.
func HyphaeDir() string { return paths.gitRepo } func HyphaeDir() string { return filepath.ToSlash(paths.gitRepo) }
// GitRepo returns the path to the Git repository of the wiki. // GitRepo returns the path to the Git repository of the wiki.
func GitRepo() string { return paths.gitRepo } func GitRepo() string { return paths.gitRepo }

2
internal/hyphae/files.go
View File

@ -72,7 +72,7 @@ func indexHelper(path string, nestLevel uint, ch chan ExistingHypha) {
} }
var ( var (
hyphaPartPath = filepath.Join(path, node.Name()) hyphaPartPath = filepath.ToSlash(filepath.Join(path, node.Name()))
hyphaName, isText, skip = mimetype.DataFromFilename(hyphaPartPath) hyphaName, isText, skip = mimetype.DataFromFilename(hyphaPartPath)
) )
if !skip { if !skip {

2
web/static/default.css
View File

@ -271,7 +271,7 @@ mark { background: rgba(130, 80, 30, 5); color: inherit; }
border: none; border: none;
background: none; background: none;
} }
.categories-card #_cat-name { .categories-card #_cat-input {
width: 100%; width: 100%;
margin: 0; margin: 0;
padding: 0 .5rem; padding: 0 .5rem;

4
web/views/hypha.html
View File

@ -110,8 +110,8 @@
{{if .GivenPermissionToModify}} {{if .GivenPermissionToModify}}
<li class="categories-card__entry categories-card__add-to-cat"> <li class="categories-card__entry categories-card__add-to-cat">
<form method="POST" action="/add-to-category" class="categories-card__add-form js-add-cat-form"> <form method="POST" action="/add-to-category" class="categories-card__add-form js-add-cat-form">
<input type="text" name="cat" id="_cat-name" class="js-add-cat-name" autocomplete="off" <input type="text" name="cat" id="_cat-input" class="js-add-cat-name" autocomplete="off"
placeholder="{{block `placeholder` .}}Category name...{{end}}"> placeholder="{{block `placeholder` .}}Category n&zwnj;ame...{{end}}">
<datalist class="js-add-cat-list" id="cat-name-options"></datalist> <datalist class="js-add-cat-list" id="cat-name-options"></datalist>
<input type="hidden" name="hypha" value="{{$hyphaName}}"> <input type="hidden" name="hypha" value="{{$hyphaName}}">
<input type="hidden" name="redirect-to" value="/hypha/{{$hyphaName}}"> <input type="hidden" name="redirect-to" value="/hypha/{{$hyphaName}}">