"MDL-13766, small changes to repository management"

diff --git a/admin/repository.php b/admin/repository.php
index 3805b09141088f2f0e369032e28a84196a3ed595..f43670b9a083d8571307943dee5fea0962a1a6a5 100644 (file)
--- a/admin/repository.php
+++ b/admin/repository.php
@@ -1,10 +1,8 @@
-<?php
-
+<?php // $Id$
 require_once(dirname(dirname(__FILE__)) . '/config.php');
 require_once($CFG->dirroot . '/repository/lib.php');
 require_once($CFG->libdir . '/adminlib.php');
 
-
 $CFG->pagepath = 'admin/managerepositories';
 
 // id of repository
@@ -25,6 +23,7 @@ if ($edit) {
 } else if ($new) {
     $pagename = 'repositorynew';
 }
+
 admin_externalpage_setup($pagename);
 require_login(SITEID, false);
 require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));

diff --git a/admin/settings/plugins.php b/admin/settings/plugins.php
index 8c37b7a6db5825d47f32ea18b95e704a5f8a7192..3aa7edef6d67769617490dadf7c326df2fbffac6 100644 (file)
--- a/admin/settings/plugins.php
+++ b/admin/settings/plugins.php
@@ -184,10 +184,10 @@ if ($hassiteconfig) {
     // repository setting
     require_once("$CFG->dirroot/repository/lib.php");
     $catname =get_string('repositories', 'repository');
-    $manage = get_string('manage', 'repository');
-    $url = "$CFG->wwwroot/$CFG->admin/repository.php";
+    $managerepo = get_string('manage', 'repository');
+    $url = $CFG->wwwroot.'/'.$CFG->admin.'/repository.php';
     $ADMIN->add('modules', new admin_category('repositorysettings', $catname));
-    $temp = new admin_settingpage('managerepositories', $manage);
+    $temp = new admin_settingpage('managerepositories', $managerepo);
     $temp->add(new admin_setting_managerepository());
     $ADMIN->add('repositorysettings', $temp);
     $ADMIN->add('repositorysettings', new admin_externalpage('repositorynew', 
@@ -199,8 +199,8 @@ if ($hassiteconfig) {
     $ADMIN->add('repositorysettings', new admin_externalpage('repositorycontroller',
         get_string('managerepositories', 'repository'), $url, 'moodle/site:config', true),
         '', $url);
-    foreach (repository_instances(get_context_instance(CONTEXT_SYSTEM), 
-                null, false) as $repository) 
+    foreach (repository_instances(get_context_instance(CONTEXT_SYSTEM), null, false) 
+        as $repository) 
     {
         if ($repository->has_admin_config()) {
             $ADMIN->add('repositorysettings',

diff --git a/lang/en_utf8/repository.php b/lang/en_utf8/repository.php
index 2ca3155f115c7f19205cd44f8fb6ce3d07f47c65..6ab3d58affadfc83b62e88cf0ba8536dfb48d1b1 100644 (file)
--- a/lang/en_utf8/repository.php
+++ b/lang/en_utf8/repository.php
@@ -1,21 +1,24 @@
 <?php //$Id$
-$string['add'] = 'Add a repository:';
+$string['add'] = 'Add';
 $string['activaterep'] = 'Active repositories';
 $string['back'] = '&lt; Back';
 $string['close'] = 'Close';
 $string['configsaved'] = 'Configuration saved!';
 $string['confirmdelete'] = 'Are you sure to delete this repository - $a?';
+$string['create'] = 'Create';
 $string['createrepository'] = 'Create a repository';
 $string['deleterepository'] = 'Delete this repository';
 $string['download'] = 'Download';
 $string['downloadsucc'] = 'Download Successfully!';
 $string['filename'] = 'Filename';
 $string['filesaved'] = 'File Saved!';
+$string['instance'] = 'instance';
 $string['invalidrepositoryid'] = 'Invalid Repository ID';
 $string['invalidplugin'] = 'Invalid Repository Plug-in';
 $string['manage'] = 'Manage repositories';
 $string['manageuserrepository'] = 'Manage individual repository';
 $string['noenter'] = 'Nothing entered';
+$string['operation'] = 'Operation';
 $string['plugin'] = 'Repository Plug-ins';
 $string['settings'] = 'Settings';
 $string['openpicker'] = 'Open file picker';

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 0ed6b854a2dba03fb1677f72b4b053243ad83aa8..e67fc5f3a1e6e10d69ba0d559167f16a69a2ee8d 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -5190,34 +5190,33 @@ class admin_setting_managerepository extends admin_setting {
         $output = print_simple_box_start(true);
         $namestr = get_string('name');
         $pluginstr = get_string('plugin', 'repository');
+        $stropt = get_string('operation', 'repository');
         $plugins = get_list_of_plugins('repository');
         $instances = repository_instances(get_context_instance(CONTEXT_SYSTEM), null, false);
-        $alreadyplugins = array();
         $table = new StdClass;
-        $table->head = array($namestr, $pluginstr, '');
+        $table->head = array($namestr, $pluginstr, $stropt);
         $table->data = array();
-
         foreach ($instances as $i) {
             $row = '';
             $row .= '<a href="' . $this->baseurl . '&edit=' . $i->id . '"><img src="' . $CFG->pixpath . '/t/edit.gif" alt="' . get_string('edit') . '" /></a>' . "\n";
             $row .= '<a href="' . $this->baseurl . '&delete=' .  $i->id . '"><img src="' . $CFG->pixpath . '/t/delete.gif" alt="' . get_string('delete') . '" /></a>' . "\n";
             $row .= ' <a href="' . $this->baseurl . '&hide=' . $i->id . '"><img src="' . $CFG->pixpath . '/t/' . ($i->visible ? 'hide' : 'show') . '.gif" alt="' . get_string($i->visible ? 'hide' : 'show') . '" /></a>' . "\n";
             $table->data[] = array($i->name, $i->type, $row);
-            if (!in_array($i->type, $alreadyplugins)) {
-                $alreadyplugins[] = $i->name;
-            }
         }
-
         $output .= print_table($table, true);
-        $instancehtml = '<div><p>';
+        $instancehtml = '<div><h3>';
         $addable = 0;
-        $instancehtml .= get_string('add', 'repository');
-        $instancehtml .= '</p>';
+        $instancehtml .= get_string('createrepository', 'repository');
+        $instancehtml .= '</h3><ul>';
         $addable = 0;
         foreach ($plugins as $p) {
-            $instancehtml .= '<a href="'.$CFG->wwwroot.'/admin/repository.php?sesskey='.$USER->sesskey.'&new='.$p.'">'.$p.'</a><br/>';
+            $instancehtml .= '<li><a href="'.$CFG->wwwroot.'/admin/repository.php?sesskey='
+                .$USER->sesskey.'&new='.$p.'">'.get_string('create', 'repository')
+                .' "'.get_string('repositoryname', 'repository_'.$p).'" '
+                .get_string('instance', 'repository').'</a></li>';
             $addable++;
         }
+        $instancehtml .= '</ul>';
 
         if ($addable) {
             $instancehtml .= '</div>';