Merge develop into 0602_contact_profile
Conflicts: mod/contacts.php
This commit is contained in:
commit
743f2e0391
128 changed files with 538 additions and 799 deletions
|
@ -59,19 +59,7 @@ The same rule applies to the JavaScript files found in
|
|||
|
||||
they will be overwritten by files in
|
||||
|
||||
/view/theme/**your-theme-name**/js
|
||||
|
||||
### Modules
|
||||
|
||||
You have the freedom to override core modules found in
|
||||
|
||||
/mod
|
||||
|
||||
They will be overwritten by files in
|
||||
|
||||
/view/theme/**your-theme-name**/mod
|
||||
|
||||
Be aware that you can break things easily here if you don't know what you do. Also notice that you can override parts of the module – functions not defined in your theme module will be loaded from the core module.
|
||||
/view/theme/**your-theme-name**/js.
|
||||
|
||||
## Expand an existing Theme
|
||||
|
||||
|
@ -300,4 +288,4 @@ The default file is in
|
|||
/view/default.php
|
||||
|
||||
if you want to change it, say adding a 4th column for banners of your favourite FLOSS projects, place a new default.php file in your theme directory.
|
||||
As with the theme.php file, you can use the properties of the $a variable with holds the friendica application to decide what content is displayed.
|
||||
As with the theme.php file, you can use the properties of the $a variable with holds the friendica application to decide what content is displayed.
|
Loading…
Add table
Add a link
Reference in a new issue