Browse Source

Move Composer assets to view/

pull/4558/head
Hypolite Petovan 3 years ago
parent
commit
274ce95d13
17 changed files with 71 additions and 70 deletions
  1. +2
    -1
      .gitignore
  2. +2
    -2
      composer.json
  3. +1
    -1
      view/templates/admin/federation.tpl
  4. +4
    -4
      view/templates/event_head.tpl
  5. +10
    -10
      view/templates/head.tpl
  6. +4
    -4
      view/theme/frio/templates/event_head.tpl
  7. +16
    -16
      view/theme/frio/templates/head.tpl
  8. +4
    -4
      view/theme/frost-mobile/templates/end.tpl
  9. +2
    -2
      view/theme/frost-mobile/templates/event_end.tpl
  10. +2
    -2
      view/theme/frost-mobile/templates/event_head.tpl
  11. +3
    -3
      view/theme/frost-mobile/templates/head.tpl
  12. +5
    -5
      view/theme/frost/templates/end.tpl
  13. +2
    -2
      view/theme/frost/templates/event_end.tpl
  14. +2
    -2
      view/theme/frost/templates/event_head.tpl
  15. +4
    -4
      view/theme/frost/templates/head.tpl
  16. +4
    -4
      view/theme/quattro/templates/events_reminder.tpl
  17. +4
    -4
      view/theme/vier/templates/event_head.tpl

+ 2
- 1
.gitignore View File

@ -53,7 +53,8 @@ nbproject
venv/
#ignore Composer dependencies
vendor
/vendor
/view/asset
#ignore config files from JetBrains
/.idea

+ 2
- 2
composer.json View File

@ -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"
}
}
},


+ 1
- 1
view/templates/admin/federation.tpl View File

@ -1,4 +1,4 @@
<script src="{{$baseurl}}/vendor/asset/Chart-js/dist/Chart.min.js"></script>
<script src="{{$baseurl}}/view/asset/Chart-js/dist/Chart.min.js"></script>
<div id="adminpage">
<h1>{{$title}} - {{$page}}</h1>


+ 4
- 4
view/templates/event_head.tpl View File

@ -1,8 +1,8 @@
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.min.css" />
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.print.min.css" media="print" />
<script type="text/javascript" src="{{$baseurl}}/vendor/asset/moment/min/moment-with-locales.min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.min.js"></script>
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.min.css" />
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.print.min.css" media="print" />
<script type="text/javascript" src="{{$baseurl}}/view/asset/moment/min/moment-with-locales.min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.min.js"></script>
<script>
function showEvent(eventid) {


+ 10
- 10
view/templates/head.tpl View File

@ -3,10 +3,10 @@
<base href="{{$baseurl}}/" />
<meta name="generator" content="{{$generator}}" />
<link rel="stylesheet" href="view/global.css" type="text/css" media="all" />
<link rel="stylesheet" href="vendor/asset/jquery-colorbox/example5/colorbox.css" type="text/css" media="screen" />
<link rel="stylesheet" href="vendor/asset/jgrowl/jquery.jgrowl.min.css" type="text/css" media="screen" />
<link rel="stylesheet" href="vendor/asset/jquery-datetimepicker/build/jquery.datetimepicker.min.css" type="text/css" media="screen" />
<link rel="stylesheet" href="vendor/asset/perfect-scrollbar/css/perfect-scrollbar.min.css" type="text/css" media="screen" />
<link rel="stylesheet" href="view/asset/jquery-colorbox/example5/colorbox.css" type="text/css" media="screen" />
<link rel="stylesheet" href="view/asset/jgrowl/jquery.jgrowl.min.css" type="text/css" media="screen" />
<link rel="stylesheet" href="view/asset/jquery-datetimepicker/build/jquery.datetimepicker.min.css" type="text/css" media="screen" />
<link rel="stylesheet" href="view/asset/perfect-scrollbar/css/perfect-scrollbar.min.css" type="text/css" media="screen" />
<link rel="stylesheet" href="vendor/pear/text_highlighter/sample.css" type="text/css" media="screen" />
<link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />
@ -34,16 +34,16 @@
<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<script type="text/javascript" src="view/js/modernizr.js" ></script>
<script type="text/javascript" src="vendor/asset/jquery/dist/jquery.min.js" ></script>
<script type="text/javascript" src="view/asset/jquery/dist/jquery.min.js" ></script>
<script type="text/javascript" src="view/js/jquery.textinputs.js" ></script>
<script type="text/javascript" src="view/js/jquery-textcomplete/jquery.textcomplete.min.js" ></script>
<script type="text/javascript" src="view/js/autocomplete.js" ></script>
<script type="text/javascript" src="vendor/asset/jquery-colorbox/jquery.colorbox-min.js"></script>
<script type="text/javascript" src="vendor/asset/jgrowl/jquery.jgrowl.min.js"></script>
<script type="text/javascript" src="vendor/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js"></script>
<script type="text/javascript" src="vendor/asset/perfect-scrollbar/js/perfect-scrollbar.jquery.min.js" ></script>
<script type="text/javascript" src="view/asset/jquery-colorbox/jquery.colorbox-min.js"></script>
<script type="text/javascript" src="view/asset/jgrowl/jquery.jgrowl.min.js"></script>
<script type="text/javascript" src="view/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js"></script>
<script type="text/javascript" src="view/asset/perfect-scrollbar/js/perfect-scrollbar.jquery.min.js" ></script>
<script type="text/javascript" src="view/js/acl.js" ></script>
<script type="text/javascript" src="vendor/asset/base64/base64.min.js" ></script>
<script type="text/javascript" src="view/asset/base64/base64.min.js" ></script>
<script type="text/javascript" src="view/js/main.js" ></script>
<script>


+ 4
- 4
view/theme/frio/templates/event_head.tpl View File

@ -1,9 +1,9 @@
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.min.css" />
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.print.min.css" media="print" />
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.min.css" />
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.print.min.css" media="print" />
<link rel="stylesheet" type="text/css" href="view/theme/frio/css/mod_events.css" />
<script type="text/javascript" src="{{$baseurl}}/vendor/asset/moment/min/moment-with-locales.min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/view/asset/moment/min/moment-with-locales.min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.min.js"></script>
<script type="text/javascript" src="view/theme/frio/js/mod_events.js"></script>
<script type="text/javascript">


+ 16
- 16
view/theme/frio/templates/head.tpl View File

@ -8,10 +8,10 @@
{{* All needed css files - Note: css must be inserted before js files *}}
<link rel="stylesheet" href="view/global.css" type="text/css" media="all" />
<link rel="stylesheet" href="vendor/asset/jquery-colorbox/example5/colorbox.css" type="text/css" media="screen" />
<link rel="stylesheet" href="vendor/asset/jgrowl/jquery.jgrowl.min.css" type="text/css" media="screen" />
<link rel="stylesheet" href="vendor/asset/jquery-datetimepicker/build/jquery.datetimepicker.min.css" type="text/css" media="screen" />
<link rel="stylesheet" href="vendor/asset/perfect-scrollbar/css/perfect-scrollbar.min.css" type="text/css" media="screen" />
<link rel="stylesheet" href="view/asset/jquery-colorbox/example5/colorbox.css" type="text/css" media="screen" />
<link rel="stylesheet" href="view/asset/jgrowl/jquery.jgrowl.min.css" type="text/css" media="screen" />
<link rel="stylesheet" href="view/asset/jquery-datetimepicker/build/jquery.datetimepicker.min.css" type="text/css" media="screen" />
<link rel="stylesheet" href="view/asset/perfect-scrollbar/css/perfect-scrollbar.min.css" type="text/css" media="screen" />
<link rel="stylesheet" href="vendor/pear/text_highlighter/sample.css" type="text/css" media="screen" />
<link rel="stylesheet" href="view/theme/frio/frameworks/bootstrap/css/bootstrap.min.css" type="text/css" media="screen"/>
@ -57,18 +57,18 @@
<!--[if IE]>
<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<script type="text/javascript" src="view/js/modernizr.js" ></script>
<script type="text/javascript" src="vendor/asset/jquery/dist/jquery.min.js"></script>
<script type="text/javascript" src="view/js/jquery.textinputs.js" ></script>
<script type="text/javascript" src="view/js/jquery-textcomplete/jquery.textcomplete.min.js" ></script>
<script type="text/javascript" src="view/js/autocomplete.js" ></script>
<script type="text/javascript" src="vendor/asset/jquery-colorbox/jquery.colorbox-min.js"></script>
<script type="text/javascript" src="vendor/asset/jgrowl/jquery.jgrowl.min.js"></script>
<script type="text/javascript" src="vendor/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js"></script>
<script type="text/javascript" src="vendor/asset/perfect-scrollbar/js/perfect-scrollbar.jquery.min.js" ></script>
<script type="text/javascript" src="view/js/acl.js" ></script>
<script type="text/javascript" src="vendor/asset/base64/base64.min.js" ></script>
<script type="text/javascript" src="view/js/main.js" ></script>
<script type="text/javascript" src="view/js/modernizr.js"></script>
<script type="text/javascript" src="view/asset/jquery/dist/jquery.min.js"></script>
<script type="text/javascript" src="view/js/jquery.textinputs.js"></script>
<script type="text/javascript" src="view/js/jquery-textcomplete/jquery.textcomplete.min.js"></script>
<script type="text/javascript" src="view/js/autocomplete.js"></script>
<script type="text/javascript" src="view/asset/jquery-colorbox/jquery.colorbox-min.js"></script>
<script type="text/javascript" src="view/asset/jgrowl/jquery.jgrowl.min.js"></script>
<script type="text/javascript" src="view/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js"></script>
<script type="text/javascript" src="view/asset/perfect-scrollbar/js/perfect-scrollbar.jquery.min.js"></script>
<script type="text/javascript" src="view/js/acl.js"></script>
<script type="text/javascript" src="view/asset/base64/base64.min.js"></script>
<script type="text/javascript" src="view/js/main.js"></script>
<script type="text/javascript" src="view/theme/frio/frameworks/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="view/theme/frio/frameworks/jasny/js/jasny-bootstrap.custom.js"></script>


+ 4
- 4
view/theme/frost-mobile/templates/end.tpl View File

@ -1,16 +1,16 @@
<!--[if IE]>
<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<script type="text/javascript" src="{{$baseurl}}/vendor/asset/jquery/dist/jquery.min.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/view/asset/jquery/dist/jquery.min.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/readmore.min.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/view/js/jquery.textinputs.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/vendor/asset/jgrowl/jquery.jgrowl.min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/vendor/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/view/asset/jgrowl/jquery.jgrowl.min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/view/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/view/js/jquery-textcomplete/jquery.textcomplete.min.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/view/js/autocomplete.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/acl.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/vendor/asset/base64/base64.min.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/view/asset/base64/base64.min.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/main.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/theme.js"></script>

+ 2
- 2
view/theme/frost-mobile/templates/event_end.tpl View File

@ -1,3 +1,3 @@
<script type="text/javascript" src="{{$baseurl}}/vendor/asset/moment/min/moment-with-locales.min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/view/asset/moment/min/moment-with-locales.min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.min.js"></script>

+ 2
- 2
view/theme/frost-mobile/templates/event_head.tpl View File

@ -1,6 +1,6 @@
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.min.css" />
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.print.min.css" media="print" />
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.min.css" />
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.print.min.css" media="print" />
<script language="javascript" type="text/javascript">
window.aclType = 'event_head';


+ 3
- 3
view/theme/frost-mobile/templates/head.tpl View File

@ -3,9 +3,9 @@
<base href="{{$baseurl}}/" />
<meta name="generator" content="{{$generator}}" />
<link rel="stylesheet" href="{{$baseurl}}/vendor/asset/jgrowl/jquery.jgrowl.min.css" type="text/css" media="screen" />
<link rel="stylesheet" href="{{$baseurl}}/vendor/asset/jquery-datetimepicker/build/jquery.datetimepicker.min.css" type="text/css" media="screen" />
<script type="text/javascript" src="{{$baseurl}}/vendor/asset/jquery/dist/jquery.min.js"></script>
<link rel="stylesheet" href="{{$baseurl}}/view/asset/jgrowl/jquery.jgrowl.min.css" type="text/css" media="screen" />
<link rel="stylesheet" href="{{$baseurl}}/view/asset/jquery-datetimepicker/build/jquery.datetimepicker.min.css" type="text/css" media="screen" />
<script type="text/javascript" src="{{$baseurl}}/view/asset/jquery/dist/jquery.min.js"></script>
<link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />


+ 5
- 5
view/theme/frost/templates/end.tpl View File

@ -3,15 +3,15 @@
<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<script type="text/javascript" src="{{$baseurl}}/vendor/asset/jquery/dist/jquery.min.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/view/asset/jquery/dist/jquery.min.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/view/js/jquery.textinputs.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/vendor/asset/jquery-colorbox/jquery.colorbox-min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/vendor/asset/jgrowl/jquery.jgrowl.min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/vendor/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/view/asset/jquery-colorbox/jquery.colorbox-min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/view/asset/jgrowl/jquery.jgrowl.min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/view/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/acl.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/vendor/asset/base64/base64.min.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/view/asset/base64/base64.min.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/view/js/jquery-textcomplete/jquery.textcomplete.min.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/view/js/autocomplete.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/main.js" ></script>


+ 2
- 2
view/theme/frost/templates/event_end.tpl View File

@ -1,3 +1,3 @@
<script type="text/javascript" src="{{$baseurl}}/vendor/asset/moment/min/moment-with-locales.min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/view/asset/moment/min/moment-with-locales.min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.min.js"></script>

+ 2
- 2
view/theme/frost/templates/event_head.tpl View File

@ -1,6 +1,6 @@
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.min.css" />
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.print.min.css" media="print" />
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.min.css" />
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.print.min.css" media="print" />
<script language="javascript" type="text/javascript">
window.aclType = 'event_head';


+ 4
- 4
view/theme/frost/templates/head.tpl View File

@ -2,13 +2,13 @@
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<base href="{{$baseurl}}/" />
<meta name="generator" content="{{$generator}}" />
<link rel="stylesheet" href="{{$baseurl}}/vendor/asset/jquery-colorbox/example5/colorbox.css" type="text/css" media="screen" />
<link rel="stylesheet" href="{{$baseurl}}/vendor/asset/jgrowl/jquery.jgrowl.min.css" type="text/css" media="screen" />
<link rel="stylesheet" href="{{$baseurl}}/vendor/asset/jquery-datetimepicker/build/jquery.datetimepicker.min.css" type="text/css" media="screen" />
<link rel="stylesheet" href="{{$baseurl}}/view/asset/jquery-colorbox/example5/colorbox.css" type="text/css" media="screen" />
<link rel="stylesheet" href="{{$baseurl}}/view/asset/jgrowl/jquery.jgrowl.min.css" type="text/css" media="screen" />
<link rel="stylesheet" href="{{$baseurl}}/view/asset/jquery-datetimepicker/build/jquery.datetimepicker.min.css" type="text/css" media="screen" />
<link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />
<script type="text/javascript" src="{{$baseurl}}/vendor/asset/jquery/dist/jquery.min.js" ></script>
<script type="text/javascript" src="{{$baseurl}}/view/asset/jquery/dist/jquery.min.js" ></script>
<link rel="shortcut icon" href="{{$baseurl}}/images/friendica-32.png" />
<link rel="search"


+ 4
- 4
view/theme/quattro/templates/events_reminder.tpl View File

@ -1,8 +1,8 @@
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.min.css" />
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.print.min.css" />
<script type="text/javascript" src="{{$baseurl}}/vendor/asset/moment/min/moment-with-locales.min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.min.js"></script>
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.min.css" />
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.print.min.css" />
<script type="text/javascript" src="{{$baseurl}}/view/asset/moment/min/moment-with-locales.min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.min.js"></script>
<script>
// start calendar from yesterday
var yesterday= new Date()


+ 4
- 4
view/theme/vier/templates/event_head.tpl View File

@ -1,8 +1,8 @@
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.min.css" />
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.print.min.css" media="print" />
<script type="text/javascript" src="{{$baseurl}}/vendor/asset/moment/min/moment-with-locales.min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/vendor/asset/fullcalendar/dist/fullcalendar.min.js"></script>
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.min.css" />
<link rel="stylesheet" type="text/css" href="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.print.min.css" media="print" />
<script type="text/javascript" src="{{$baseurl}}/view/asset/moment/min/moment-with-locales.min.js"></script>
<script type="text/javascript" src="{{$baseurl}}/view/asset/fullcalendar/dist/fullcalendar.min.js"></script>
<script>
function showEvent(eventid) {


Loading…
Cancel
Save