+ createLink('weekly', 'exportweeklyreport', "module=weekly&projectID={$project->id}"), $this->lang->export, '', "class='btn btn-primary' data-width='30%' id='exportreport' data-group='project'");?>
+
diff --git a/module/weekly/control.php b/module/weekly/control.php index bbc70ebeca..d1ed5e2a76 100755 --- a/module/weekly/control.php +++ b/module/weekly/control.php @@ -33,11 +33,6 @@ class weekly extends control */ public function commonAction($projectID = 0) { - if(common::hasPriv('weekly', 'exportweeklyreport')) - { - $this->lang->TRActions = "
loadModel('project')->setMenu($projectID); } @@ -63,8 +58,6 @@ class weekly extends control $this->view->title = $this->lang->weekly->common; $this->view->date = $date; - - $this->lang->modulePageNav = $this->weekly->getPageNav($this->view->project, $date); $this->display(); } diff --git a/module/weekly/css/index.css b/module/weekly/css/index.css index ff63cecf01..03835768ab 100644 --- a/module/weekly/css/index.css +++ b/module/weekly/css/index.css @@ -6,3 +6,4 @@ #helpDropdown .dropdown-menu{width:600px; text-align:left; height:300px; overflow:auto; background: #fff; padding-left:8px;} #helpDropdown h2{font-size:14px; padding:0px; margin:0px; margin-top:10px;} #helpDropdown p{padding:0px; margin:0px; margin-top:10px;} +#mainMenu .btn-toolbar {margin-bottom: 5px;} diff --git a/module/weekly/view/index.html.php b/module/weekly/view/index.html.php index f3b5cabeaa..ca1b530e9d 100644 --- a/module/weekly/view/index.html.php +++ b/module/weekly/view/index.html.php @@ -17,6 +17,9 @@ $(function(){$('#exportreport').modalTrigger();});