Commit 99429c5c authored by Anthony Geourjon's avatar Anthony Geourjon
Browse files

Merge branch 'master' into...

Merge branch 'master' into EDCAMPUS-51-redirection-vers-les-infos-a-la-creation-dun-projet-independant
parents e45ca7b9 dee402b6
......@@ -125,11 +125,6 @@ root.controller('AdminCompaniesCtrl' ,['$scope','$http','$stateParams', '$univer
$("#companyDetailsModal").removeClass("hide")
$("#companyDetailsModal").show()
}
adminCompaniesCtrl.closeModalCompanyDetails = function(){
adminCompaniesCtrl.detailsCompanyPanel = false;
$("#companyDetailsModal").hide()
}
adminCompaniesCtrl.openModalNewCompany = function(){
adminCompaniesCtrl.addCompanyPanel=true;adminCompaniesCtrl.detailsCompanyPanel=false;
......
......@@ -41,7 +41,7 @@
<div id="companyDetailsModal" class="chatPopupManager hide" >
<div class="dialog" style='width: 800px;height:560px;top:50px'>
<a ng-click='adminCompaniesCtrl.closeModalCompanyDetails();' title="Close" class="pointerOn close"><i class="fa fa-times"></i></a>
<a ui-sref="admin.companies({entrepriseId:null})" title="Close" class="pointerOn close"><i class="fa fa-times"></i></a>
<h4>{{entreprise.fullName}}</h4>
<div ng-include src="__root+'components/admin/companies/details.html'"></div>
......
......@@ -32,25 +32,24 @@
</div>
</div>
<div class="project-icon-section col-md-2 col-xs-3 pointerOn">
<div class="project-icon custom-tooltip smalltooltip event-file">
<span class="activity-notification-menu" ng-if="::project.deliverables"></span>
<span ui-sref="project.deliverables({projectName:project.label})" class="fa fa-folder"></span>
<span class="tooltiptext" style="line-height:12px;">{{::_labels.deliverables}}</span>
<span class="activity-notification-menu" ng-if="::project.files"></span>
<span ui-sref="project.files({projectName:project.label})" class="fa fa-folder"></span>
<span class="tooltiptext" style="line-height:12px;">{{::_labels.files}}</span>
</div>
</div>
<div class="project-icon-section col-md-2 col-xs-3 pointerOn">
<div class="project-icon custom-tooltip smalltooltip event-assessment">
<span class="activity-notification-menu" ng-if="::project.assessments"></span>
<span ui-sref="project.assessments.planning({projectName:project.label})" class="fa fa-line-chart"></span>
<span class="tooltiptext" style="line-height:12px;">{{::_labels.assessments}}</span>
<span class="activity-notification-menu" ng-if="::project.deliverables"></span>
<span ui-sref="project.deliverables({projectName:project.label})" class="fa fa-line-chart"></span>
<span class="tooltiptext" style="line-height:12px;">{{::_labels.deliverables}}</span>
</div>
</div>
<div class="project-icon-section col-md-2 col-xs-3 pointerOn">
<div class="project-icon custom-tooltip smalltooltip event-calendar">
<span class="activity-notification-menu" ng-if="::project.events"></span>
......@@ -60,6 +59,19 @@
</div>
</div>
<!--<div class="project-icon-section col-md-2 col-xs-3 pointerOn">
<div class="project-icon custom-tooltip smalltooltip event-assessment">
<span class="activity-notification-menu" ng-if="::project.assessments"></span>
<span ui-sref="project.assessments.planning({projectName:project.label})" class="fa fa-line-chart"></span>
<span class="tooltiptext" style="line-height:12px;">{{::_labels.assessments}}</span>
</div>
</div>-->
</div>
</div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment