Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: edit link docs repo subpath #618

Merged
merged 2 commits into from
Feb 1, 2022

Conversation

james-d-elliott
Copy link
Contributor

@james-d-elliott james-d-elliott commented Jan 20, 2022

Can be used if the folder with your content is in a subfolder so if your project wishes to contain code and docs in the same repo it's convenient to do so. Additionally includes some refactoring in the edit-page.html logic to make it easier to manage. Also added Bitbucket and BitbucketServer repo types.

@james-d-elliott
Copy link
Contributor Author

james-d-elliott commented Jan 20, 2022

I made this PR mainly because I implemented it locally and felt it may be a good addition. No harm if you don't like the idea, or if you'd like me to change it let me know.

Edit: FP because the gpg key used was incorrect, somehow my git config got messed up.

Can be used if the folder with your content is in a subfolder so if your project wishes to contain code and docs in the same repo it's convenient to do so. Additionally includes some refactoring in the edit-page.html logic to make it  easier to manage.
Bitbucket (bitbucket.org) is different to BitbucketServer, so made sure to add the distinction. Also moved a declaration closer to where it's used.
@h-enk
Copy link
Member

h-enk commented Jan 20, 2022

Nice! Surely an improvement that would fit Doks. Looks good, but I'd like to have a closer look.

@h-enk h-enk added this to the v0.4.0 milestone Jan 28, 2022
h-enk
h-enk previously requested changes Jan 31, 2022
Copy link
Member

@h-enk h-enk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One minor thing.

The default content directory always includes en. So, https://github.com/h-enk/doks/blob/b063faaf376ab9a47315177d4a11e2f63f7d4899/layouts/partials/main/edit-page.html#L23-L27 should be just:

{ $parts = $parts | append "content" .Lang $filePath }}

@h-enk h-enk dismissed their stale review February 1, 2022 12:43

I'll make the changes, so you don't have to

@h-enk h-enk merged commit 79ad59f into gethyas:master Feb 1, 2022
adhadse pushed a commit to adhadse/doks that referenced this pull request Sep 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants