Merge pull request #33 from fb83/master

added some german translations, translated into german
phpfreak · Mar 13, 2013 · 0f632aa · 0f632aa
2 parents 06c30b7 + c413dfb
commit 0f632aa
Show file tree

Hide file tree

Showing 5 changed files with 1,497 additions and 1,325 deletions.
diff --git a/application/plugins/links/controllers/LinksController.class.php b/application/plugins/links/controllers/LinksController.class.php
@@ -38,7 +38,7 @@ function index() {
       tpl_assign('folders', active_project()->getFolders());
       //tpl_assign('folder_tree', ProjectFolders::getProjectFolderTree(active_project())); 
       tpl_assign('folder_tree', array() ); 
-      $this->setSidebar(get_template_path('index_sidebar', 'files'));    
+      $this->setSidebar(get_template_path('index_sidebar', 'links'));    
     } // index
 
     function add_link() {

diff --git a/application/plugins/links/views/edit_link.php b/application/plugins/links/views/edit_link.php
@@ -32,10 +32,12 @@
     <?php echo textarea_field('project_link[description]', array_var($project_link_data, 'description'), array('id' => 'linkFormDescription', 'class' => 'long')) ?>
   </div>
 
+  <?php if (plugin_active('files')) { ?>
   <div>
     <?php echo label_tag(lang('folder'), 'linkFormFolder', true) ?>
     <?php echo select_project_folder('project_link[folder_id]', active_project(), array_var($project_link_data, 'folder_id'), array('id' => 'linkFormFolder')) ?>
   </div>
+  <?php } ?>
 
 <?php if (plugin_active('tags')) { ?>  
   <fieldset>

diff --git a/application/views/dashboard/my_tasks.php b/application/views/dashboard/my_tasks.php
@@ -87,6 +87,9 @@
 <?php if ($assigned_task->getTaskList() instanceof ProjectTaskList) { ?>
             (<?php echo lang('project') ?> <a href="<?php echo $assigned_task->getTaskList()->getViewUrl() ?>"><?php echo clean($assigned_task->getTaskList()->getName()) ?></a>)
           <div class="options">
+             <?php if ($assigned_task->canView(logged_user())) { ?>
+                <a href="<?php echo $assigned_task->getViewUrl() ?>" class="blank"><?php echo lang('view task') ?></a>&nbsp;
+             <?php } // if ?>
              <?php if ($assigned_task->canEdit(logged_user())) { ?>
                 <a href="<?php echo $assigned_task->getEditUrl() ?>" class="blank"><?php echo lang('edit task') ?></a>&nbsp;
              <?php } // if ?>