Add the ability to have built in themes in Gitea #4198

techknowlogick · 2018-06-09T18:05:42Z

This makes it easier for user who want to theme but
dont have the ability to know how to customize themplates
all that is required is a change in a config option

The reason why I chose the DEFAULT_THEME as variable,
as perhaps in the future we will allow users to chose their
theme whon logged in just like we do with languages

Fix #56

This makes it easier for user who want to theme but dont have the ability to know how to customize themplates all that is required is a change in a config option The reason why I chose the DEFAULT_THEME as variable, as perhaps in the future we will allow users to chose their theme whon logged in just like we do with languages Fix #56

codecov-io · 2018-06-09T18:13:08Z

Codecov Report

Merging #4198 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #4198   +/-   ##
=======================================
  Coverage   20.06%   20.06%           
=======================================
  Files         153      153           
  Lines       30769    30769           
=======================================
  Hits         6174     6174           
  Misses      23652    23652           
  Partials      943      943

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 28c1c90...d2f944b. Read the comment docs.

jonasfranz · 2018-06-11T07:10:31Z

templates/base/head.tmpl

@@ -127,6 +127,9 @@
 	<meta property="og:url" content="{{AppUrl}}" />
 	<meta property="og:description" content="{{MetaDescription}}">
 {{end}}
+{{if not (eq DefaultTheme "default")}}


Use ˋneqˋ instead

Thanks @JonasFranzDEV. I've made the change.

@JonasFranzDEV per the failed CI neq is not defined, and so I will revert back to original

DblK · 2018-06-12T09:18:53Z

If I understand well the modification, it will allow us to have a css theme.
Maybe another PR should be good to add the possibility to modify .tmpl files.
Good work, and less hacky to what I am doing now.

davydov-vyacheslav · 2018-06-12T09:52:37Z

Am I correct that current values for DEFAULT_THEME are 'default' and 'dark' ?

BTW, why 'default theme' ? IMHO, 'default' means that value is set because no one choosed it. If we declare the value of theme, and no-one can change it in runtime (e.g. user-specific theme), the theme is not default. Correct me if I'm wrong or missed anything

lafriks · 2018-06-12T16:58:21Z

@davydov-vyacheslav but in the future we could add that user is allowed to change theme so not to have rename configuration variable and break compatibility it is better to have this way from the begining

techknowlogick · 2018-07-03T21:07:11Z

@JonasFranzDEV @flufmonster needs your review

lunny · 2018-07-04T13:33:05Z

custom/conf/app.ini.sample

@@ -75,6 +75,8 @@ THEME_COLOR_META_TAG = `#6cc644`
 MAX_DISPLAY_FILE_SIZE = 8388608
 ; Whether the email of the user should be shown in the Explore Users page
 SHOW_USER_EMAIL = true
+; Set the default theme for the Gitea install
+DEFAULT_THEME = default


The default theme maybe need a name.

@lunny what about "gitea"?

That's a great idea I think.

@lunny updated

jonasfranz · 2018-07-05T08:55:34Z

custom/conf/app.ini.sample

@@ -75,6 +75,8 @@ THEME_COLOR_META_TAG = `#6cc644`
 MAX_DISPLAY_FILE_SIZE = 8388608
 ; Whether the email of the user should be shown in the Explore Users page
 SHOW_USER_EMAIL = true
+; Set the default theme for the Gitea install
+DEFAULT_THEME = gitea


Maybe it is better to use the default value ˋdefaultˋ here since you’re using it in the config cheat sheet.

Opps. I updated this per @lunny feedback, but I forgot to update docs. Let me do that there.

jonasfranz · 2018-07-05T08:59:51Z

templates/base/head.tmpl

@@ -127,6 +127,9 @@
 	<meta property="og:url" content="{{AppUrl}}" />
 	<meta property="og:description" content="{{MetaDescription}}">
 {{end}}
+{{if not (eq DefaultTheme "gitea")}}


Use ne instead

jonasfranz · 2018-07-05T09:01:04Z

modules/templates/helper.go

@@ -186,6 +186,9 @@ func NewFuncMap() []template.FuncMap {
 		"ParseDeadline": func(deadline string) []string {
 			return strings.Split(deadline, "|")
 		},
+		"DefaultTheme": func() string {
+			return setting.UI.DefaultTheme


I think that it may be better to add this as variable to data since this function just acts like a variable.

I'm not sure about this because this pattern already exists and I am just following. Example see AppUrl above in this file.

jonasfranz · 2018-07-05T09:02:06Z

docs/content/doc/advanced/config-cheat-sheet.en-us.md

@@ -68,6 +68,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
 - `EXPLORE_PAGING_NUM`: **20**: Number of repositories that are shown in one explore page.
 - `ISSUE_PAGING_NUM`: **10**: Number of issues that are shown in one page (for all pages that list issues).
 - `FEED_MAX_COMMIT_NUM`: **5**: Number of maximum commits shown in one activity feed.
+- `DEFAULT_THEME`: **default**: Set the default theme for the Gitea install.


Maybe list bundled themes if there is some themes?

jonasfranz · 2018-07-05T14:33:40Z

IMHO we should document this feature in the docs beside the CCS. https://docs.gitea.io/en-us/customizing-gitea/ might be a candidate.

techknowlogick · 2018-07-05T15:54:18Z

@JonasFranzDEV docs updated

jonasfranz · 2018-07-05T17:53:01Z

docs/content/doc/advanced/customizing-gitea.en-us.md

+
+## Customizing the look of Gitea
+
+Gitea has two builtin themes, the default theme `gitea`, and a dark theme `arc-green`. To change the look of your Gitea install change the value of `[ui] DEFAULT_THEME` in `app.ini` to another one of the available options.


built-in instead of builtin.
[UI] DEFAULT_THEME might be a little bit confusing. I would propose to create a link to the UI section of the CSC (https://docs.gitea.io/en-us/config-cheat-sheet/#ui-ui).

Thanks @JonasFranzDEV 😄

I've made these changes.

Prepare for wild/v1.6 branch * BREAKING * Respect email privacy option in user search via API (go-gitea#4512) * Simply remove tidb and deps (go-gitea#3993) * Swagger.v1.json template (go-gitea#3572) * FEATURE * Pull request review/approval and comment on code (go-gitea#3748) * Added dependencies for issues (go-gitea#2196) (go-gitea#2531) * Add the ability to have built in themes in Gitea and provide dark theme arc-green (go-gitea#4198) * Add sudo functionality to the API (go-gitea#4809) * Add oauth providers via cli (go-gitea#4591) * Disable merging a WIP Pull request (go-gitea#4529) * Force user to change password (go-gitea#4489) * Add letsencrypt to Gitea (go-gitea#4189) * Add push webhook support for mirrored repositories (go-gitea#4127) * Add csv file render support defaultly (go-gitea#4105) * Add Recaptcha functionality to Gitea (go-gitea#4044) * BUGFIXES * Fix release creation via API (go-gitea#5076) * Remove links from topics in edit mode (go-gitea#5026) * Fix missing AppSubUrl in few more templates (fixup) (go-gitea#5021) * Fix missing AppSubUrl in some templates (go-gitea#5020) * Hide outdated comments in file view (go-gitea#5017) * Upgrade gopkg.in/testfixtures.v2 (go-gitea#4999) * Disable debug routes unless PPROF is enabled in configuration (go-gitea#4995) * Fix user menu item styling (go-gitea#4985) * Fix layout of the topics editing form (go-gitea#4971) * Fix null pointer dereference in ParseCommitWithSignature (go-gitea#4962) * Fix url in discord webhook (go-gitea#4953) * Detect charset and convert non UTF-8 files for display (go-gitea#4950) * Make sure to catch the right error so it is displayed on the UI (go-gitea#4945) * Fix(topics): don't redirect to explore page. (go-gitea#4938) * Fix bug forget to remove Stopwatch when remove repository (go-gitea#4928) * Fix bug when repo remained bare if multiple branches pushed in single push (go-gitea#4923) * Fix: Let's Encrypt configuration settings (go-gitea#4911) * Fix: Crippled diff (go-gitea#4726) (go-gitea#4900) * Fix trimming of markup section names (go-gitea#4863) * Issues api allow pulls and fix go-gitea#4832 (go-gitea#4852) * Do not autocreate directory for new users/orgs (go-gitea#4828) (go-gitea#4849) * Fix redirect with non-ascii branch names (go-gitea#4764) (go-gitea#4810) * Fix missing release title in webhook (go-gitea#4783) (go-gitea#4796) * User shouldn't be able to approve or reject his/her own PR (go-gitea#4729) * Make sure to reset commit count in the cache on mirror syncing (go-gitea#4720) * Fixed bug where team with admin privelege type doesn't get any unit (go-gitea#4719) * Fix incorrect caption of webhook setting (go-gitea#4701) (go-gitea#4717) * Allow WIP marker to contains < or > (go-gitea#4709) * Hide org/create menu item in Dashboard if user has no rights (go-gitea#4678) (go-gitea#4680) * Site admin could create repos even MAX_CREATION_LIMIT=0 (go-gitea#4645) * Fix custom templates being ignored (go-gitea#4638) * Fix starring icon after semantic ui update (go-gitea#4628) * Fix Split-View line adjustment (go-gitea#4622) * Fix integer constant overflows in tests (go-gitea#4616) * Push whitelist now doesn't apply to branch deletion (go-gitea#4601) (go-gitea#4607) * Fix bugs when too many IN variables (go-gitea#4594) * Fix failure on creating pull request with assignees (go-gitea#4419) (go-gitea#4583) * Fix panic issue on update avatar email (go-gitea#4580) (go-gitea#4581) * Fix status code label for a successful webhook (go-gitea#4540) * An inactive user shouldn't be able to be added as a collaborator (go-gitea#4535) * Don't fail silently if trying to add a collaborator twice (go-gitea#4533) * Fix incorrect MergeWhitelistTeamIDs check in CanUserMerge function (go-gitea#4519) (go-gitea#4525) * Fix out-of-transaction query in removeOrgUser (go-gitea#4521) (go-gitea#4522) * Fix migration from older releases (go-gitea#4495) * Accept 'Data:' in commit graph (go-gitea#4487) * Update xorm to latest version and fix correct `user` table referencing in sql (go-gitea#4473) * Relative URLs for LibreJS page (go-gitea#4460) * Redirect to correct page after using scratch token (go-gitea#4458) * Fix column droping for MSSQL that need new transaction for that (go-gitea#4440) * Replace src with raw to fix image paths (go-gitea#4377) * Add default merge options when creating new repository (go-gitea#4369) * Fix docker build (go-gitea#4358) * Fixes repo membership check in API (go-gitea#4341) * Dep upgrade mysql lib (go-gitea#4161) * Fix some issues with special chars in branch names (go-gitea#3767) * Responsive design fixes (go-gitea#4508) * ENHANCEMENT * Fix milestones sorted wrongly (go-gitea#4987) * Allow api to create tags for releases if they don't exist (go-gitea#4890) * Fix go-gitea#4877 to follow the OpenID Connect Audiences spec (go-gitea#4878) * Enforce token on api routes [fixed critical security issue go-gitea#4357] (go-gitea#4840) * Update legacy branch and tag URLs in dashboard to new format (go-gitea#4812) * Slack webhook channel name cannot be empty or just contain an hashtag (go-gitea#4786) * Add whitespace handling to PR-comparsion (go-gitea#4683) * Make reverse proxy auth optional (go-gitea#4643) * MySQL TLS (go-gitea#4642) * Make sure to set PR split view when creating/previewing a pull request (go-gitea#4617) * Log user in after a successful sign up (go-gitea#4615) * Fix typo IsPullReuqestBroken -> IsPullRequestBroken (go-gitea#4578) * Allow admin toggle forcing a password change for newly created users (go-gitea#4563) * Update jQuery to v1.12.4 (go-gitea#4551) * Env var GITEA_PUSHER_EMAIL (go-gitea#4516) * Feat(repo): support search repository by topic name (go-gitea#4505) * Small improvements to dependency UI (go-gitea#4503) * Make max commits in graph configurable (go-gitea#4498) * Add valid for lfs oid (go-gitea#4461) * Add shortcut to save wiki page (go-gitea#4452) * Allow administrator to create repository for any organization (go-gitea#4368) * Fix repository last updated time update when delete a user who watched the repo (go-gitea#4363) * Switch plaintext scratch tokens to use hash instead (go-gitea#4331) * Increase default TOTP secret size to 320 bits (go-gitea#4287) * Keep preseeded database password (go-gitea#4284) * Implemented hover text showing user FullName (go-gitea#4261) * Add ability to delete a token (go-gitea#4235) * Fix typos in i18n variable names. (go-gitea#4080) * Api: repos/search: add parameters to control the sort order (go-gitea#3964) * Add missing path in the Docker app.ini template (go-gitea#2181) * Add file name and branch to page title (go-gitea#4902) * Offline use of google fonts (go-gitea#4872) * Add missing History link to directory listings v2 (go-gitea#4829) * Locale for Edit and Remove due date issue (go-gitea#4802) * Disable 'May Import Local Repository' when is disabled by setting (Is… (go-gitea#4780) * API /admin/users/{username} missing parameter (go-gitea#4775) * Display error when adding a user to a team twice (go-gitea#4746) * Remove UsePrivilegeSeparation from the Docker sshd_config, see go-gitea#2876 (go-gitea#4722) * Focus title input when clicking helper link (go-gitea#4696) * Add vendor to user reserved words and format words list according alphabet (go-gitea#4685) * Add gitea/issues link to 500 page (go-gitea#4654) * Hide home button when landing page is not set to home (go-gitea#4651) * Remove link to GitHub issues in 404 template (go-gitea#4639) * Cmd/serve: pprof cpu and memory profile dumps to disk (go-gitea#4560) * Add flash message after an account has been successfully activated (go-gitea#4510) * Prevent html entity escaping on delete branch (go-gitea#4471) * Locale for button Edit on protected branch (go-gitea#4442) * Update notification icon (go-gitea#4343) * Added front-end topics validation (go-gitea#4316) * Don't display buttons if there are no system notifications (go-gitea#4280) * Issue due date api (go-gitea#3890) * SECURITY * Improve URL validation for external wiki and external issues (go-gitea#4710) * Make cookies HttpOnly and obey COOKIE_SECURE flag (go-gitea#4706) * Don't disclose emails of all users when sending out emails (go-gitea#4664) * Check that repositories can only be migrated to own user or organizations (go-gitea#4366) * TRANSLATION * Fix punctuation in English translation (go-gitea#4958) * Fix translation (go-gitea#4355)

techknowlogick and others added 2 commits June 9, 2018 14:02

Merge branch 'master' into theme

c410f17

techknowlogick added this to the 1.6.0 milestone Jun 9, 2018

techknowlogick added type/feature Completely new functionality. Can only be merged if feature freeze is not active. topic/ui Change the appearance of the Gitea UI topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile labels Jun 9, 2018

bkcsoft added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 9, 2018

Merge branch 'master' into theme

7686c0c

jonasfranz suggested changes Jun 11, 2018

View reviewed changes

techknowlogick added 2 commits June 11, 2018 03:17

update per feedback

2980555

Merge branch 'master' into theme

b06271d

techknowlogick added 2 commits June 12, 2018 12:17

Merge branch 'master' into theme

bc898b2

neq not defined

5081c40

techknowlogick and others added 10 commits June 17, 2018 16:14

Merge branch 'master' into theme

fc552b6

Merge branch 'master' into theme

60757b5

Merge branch 'master' into theme

c47dc20

Merge branch 'master' into theme

29fd549

Merge branch 'master' into theme

6f7d8a1

Rename theme-dark.css to theme-arc-green.css

56bae58

Rename dark.less to arc-green.less

af2665b

strip new line

e281c86

fix make generate-stylesheets

37a8076

Merge branch 'master' into theme

366b573

lunny reviewed Jul 4, 2018

View reviewed changes

Merge branch 'master' into theme

8d8c60c

techknowlogick added 2 commits July 4, 2018 10:29

update theme name

554a862

update theme name

eb5e2ca

ghost deleted a comment from techknowlogick Jul 4, 2018

jonasfranz suggested changes Jul 5, 2018

View reviewed changes

techknowlogick added 3 commits July 5, 2018 10:26

simplify template

3e99050

add options for themes

b70165f

update default theme name

c3c0c9c

add documentation about theme

362a4d0

Merge branch 'master' into theme

4ac504f

jonasfranz reviewed Jul 5, 2018

View reviewed changes

update docs

686e0c2

jonasfranz approved these changes Jul 5, 2018

View reviewed changes

bkcsoft added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jul 5, 2018

lafriks approved these changes Jul 5, 2018

View reviewed changes

bkcsoft added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jul 5, 2018

Merge branch 'master' into theme

d2f944b

techknowlogick merged commit f1d6a1f into go-gitea:master Jul 5, 2018

techknowlogick deleted the theme branch July 5, 2018 21:25

lunny added the type/changelog Adds the changelog for a new Gitea version label Oct 17, 2018

go-gitea locked and limited conversation to collaborators Nov 24, 2020

delvh removed the type/changelog Adds the changelog for a new Gitea version label Oct 7, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add the ability to have built in themes in Gitea #4198

Add the ability to have built in themes in Gitea #4198

techknowlogick commented Jun 9, 2018

codecov-io commented Jun 9, 2018 •

edited

Loading

jonasfranz Jun 11, 2018

techknowlogick Jun 11, 2018

techknowlogick Jun 12, 2018

DblK commented Jun 12, 2018

davydov-vyacheslav commented Jun 12, 2018 •

edited

Loading

lafriks commented Jun 12, 2018

techknowlogick commented Jul 3, 2018

lunny Jul 4, 2018

techknowlogick Jul 4, 2018

lunny Jul 4, 2018

techknowlogick Jul 4, 2018

jonasfranz Jul 5, 2018

techknowlogick Jul 5, 2018

jonasfranz Jul 5, 2018

jonasfranz Jul 5, 2018 •

edited

Loading

techknowlogick Jul 5, 2018

jonasfranz Jul 5, 2018

jonasfranz commented Jul 5, 2018

techknowlogick commented Jul 5, 2018

jonasfranz Jul 5, 2018

techknowlogick Jul 5, 2018


		## Customizing the look of Gitea

		Gitea has two builtin themes, the default theme `gitea`, and a dark theme `arc-green`. To change the look of your Gitea install change the value of `[ui] DEFAULT_THEME` in `app.ini` to another one of the available options.

Add the ability to have built in themes in Gitea #4198

Add the ability to have built in themes in Gitea #4198

Conversation

techknowlogick commented Jun 9, 2018

codecov-io commented Jun 9, 2018 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DblK commented Jun 12, 2018

davydov-vyacheslav commented Jun 12, 2018 • edited Loading

lafriks commented Jun 12, 2018

techknowlogick commented Jul 3, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jonasfranz Jul 5, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jonasfranz commented Jul 5, 2018

techknowlogick commented Jul 5, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov-io commented Jun 9, 2018 •

edited

Loading

davydov-vyacheslav commented Jun 12, 2018 •

edited

Loading

jonasfranz Jul 5, 2018 •

edited

Loading