Merge pull request #536 in FS/freeswitch from feature/vc-help-about to master

* commit 'c1736915ade5ae554d990271f8e5940428ca0c07':
  FS-8288 About Screen and Help link
This commit is contained in:
Ken Rice
2015-10-02 17:54:01 -05:00
11 changed files with 90 additions and 2 deletions

View File

@@ -3,5 +3,6 @@
"Ítalo Rossi <italo@evolux.net.br>",
"Stefan Yohansson <stefan@evolux.net.br>",
"João Mesquita <jmesquita@indicium.com.ar>",
"Ken Rice <krice@freeswitch.org>"
"Ken Rice <krice@freeswitch.org>",
"Brian West <brian@freeswitch.org>"
]

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

View File

@@ -102,6 +102,7 @@
<script type="text/javascript" src="src/vertoControllers/controllers/BrowserUpgradeController.js"></script>
<script type="text/javascript" src="src/vertoControllers/controllers/ChatController.js"></script>
<script type="text/javascript" src="src/vertoControllers/controllers/ContributorsController.js"></script>
<script type="text/javascript" src="src/vertoControllers/controllers/AboutController.js"></script>
<script type="text/javascript" src="src/vertoControllers/controllers/DialPadController.js"></script>
<script type="text/javascript" src="src/vertoControllers/controllers/InCallController.js"></script>
<script type="text/javascript" src="src/vertoControllers/controllers/LoginController.js"></script>

View File

@@ -0,0 +1,22 @@
<div class="modal-header">
</div>
<div class="modal-body">
<ul class="contributors">
<li>
<div class="clearfix"><img src="img/vc_logo.png"></div>
</li>
<li>
<div class="clearfix">Version: 0.1.0</div>
</li>
<li>
<div class="clearfix">Git Rev: {{ githash }}</div>
</li>
<li>
<div class="clearfix">Powered By: <a href="https://freeswitch.org/" target="_blank"><img src="img/fs_logo_small.png" height="30"></a></div>
</li>
</ul>
</div>
<div class="modal-footer">
</div>

View File

@@ -58,9 +58,15 @@
</ul>
</li>
<li class="navbar-item-icon">
<a href="" ng-click="showContributors()">
<a href="" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
<i class="mdi-action-loyalty"></i>
<span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
<li><a href="" ng-click="showAbout()">About</a></li>
<li><a href="" ng-click="showContributors()">Contributors</a></li>
<li><a href="https://freeswitch.org/confluence/x/MQCT" target="_blank">Help</a></li>
</ul>
</li>
</ul>

View File

@@ -0,0 +1,23 @@
(function() {
'use strict';
angular
.module('vertoControllers')
.controller('AboutController', ['$scope', '$http',
'toastr',
function($scope, $http, toastr) {
var githash = '/* @echo revision */' || 'something is not right';
$scope.githash = githash;
/* leave this here for later, but its not needed right now
$http.get(window.location.pathname + '/contributors.txt')
.success(function(data) {
})
.error(function() {
toastr.error('contributors not found.');
});
*/
}
]);
})();

View File

@@ -152,6 +152,10 @@
};
$scope.showAbout = function() {
$scope.openModal('partials/about.html', 'AboutController');
};
$scope.showContributors = function() {
$scope.openModal('partials/contributors.html', 'ContributorsController');
};