From: Hypolite Petovan Date: Wed, 7 Mar 2018 13:07:36 +0000 (-0500) Subject: Move Composer assets to view/ X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=274ce95d13feb0ff7b150c9a0c3d1db49eb507bb;p=friendica.git Move Composer assets to view/ --- diff --git a/.gitignore b/.gitignore index 8592206539..8d86b95875 100644 --- a/.gitignore +++ b/.gitignore @@ -53,7 +53,8 @@ nbproject venv/ #ignore Composer dependencies -vendor +/vendor +/view/asset #ignore config files from JetBrains /.idea \ No newline at end of file diff --git a/composer.json b/composer.json index 7bdba4cf0e..e064a0a6a9 100644 --- a/composer.json +++ b/composer.json @@ -54,8 +54,8 @@ "preferred-install": "dist", "fxp-asset": { "installer-paths": { - "npm-asset-library": "vendor/asset", - "bower-asset-library": "vendor/asset" + "npm-asset-library": "view/asset", + "bower-asset-library": "view/asset" } } }, diff --git a/view/templates/admin/federation.tpl b/view/templates/admin/federation.tpl index bd2af3d784..5f89d4f7d0 100644 --- a/view/templates/admin/federation.tpl +++ b/view/templates/admin/federation.tpl @@ -1,4 +1,4 @@ - +

{{$title}} - {{$page}}

diff --git a/view/templates/event_head.tpl b/view/templates/event_head.tpl index 36be152902..baa031f048 100644 --- a/view/templates/event_head.tpl +++ b/view/templates/event_head.tpl @@ -1,8 +1,8 @@ - - - - + + + + - + - - - - + + + + - + - + + - - - - - - - - - - - + + + + + + + + + + + + diff --git a/view/theme/frost-mobile/templates/end.tpl b/view/theme/frost-mobile/templates/end.tpl index 4af3b41c0b..a37ae7bba7 100644 --- a/view/theme/frost-mobile/templates/end.tpl +++ b/view/theme/frost-mobile/templates/end.tpl @@ -1,16 +1,16 @@ - + - - + + - + diff --git a/view/theme/frost-mobile/templates/event_end.tpl b/view/theme/frost-mobile/templates/event_end.tpl index 1df60bdfd8..8641b7c1b8 100644 --- a/view/theme/frost-mobile/templates/event_end.tpl +++ b/view/theme/frost-mobile/templates/event_end.tpl @@ -1,3 +1,3 @@ - - + + diff --git a/view/theme/frost-mobile/templates/event_head.tpl b/view/theme/frost-mobile/templates/event_head.tpl index 6c332b435c..e4abc175a6 100644 --- a/view/theme/frost-mobile/templates/event_head.tpl +++ b/view/theme/frost-mobile/templates/event_head.tpl @@ -1,6 +1,6 @@ - - + + + + + diff --git a/view/theme/frost/templates/end.tpl b/view/theme/frost/templates/end.tpl index b49fc3cd4c..b8a598de5e 100644 --- a/view/theme/frost/templates/end.tpl +++ b/view/theme/frost/templates/end.tpl @@ -3,15 +3,15 @@ - + - - - + + + - + diff --git a/view/theme/frost/templates/event_end.tpl b/view/theme/frost/templates/event_end.tpl index 1df60bdfd8..8641b7c1b8 100644 --- a/view/theme/frost/templates/event_end.tpl +++ b/view/theme/frost/templates/event_end.tpl @@ -1,3 +1,3 @@ - - + + diff --git a/view/theme/frost/templates/event_head.tpl b/view/theme/frost/templates/event_head.tpl index 6c332b435c..e4abc175a6 100644 --- a/view/theme/frost/templates/event_head.tpl +++ b/view/theme/frost/templates/event_head.tpl @@ -1,6 +1,6 @@ - - + + + - - - + + + + - + + + +