Make license selectable from config FS#312

darcs-hash:20081012113150-7ad00-6408da058bdb6c923159d445e03b76f54b579362.gz

22 files changed, 36 insertions, 1 deletions

diff --git a/lib/images/license/badge/cc-by-nc-nd.png b/lib/images/license/badge/cc-by-nc-nd.png
new file mode 100644
index 000000000..49f272f82
--- /dev/null
+++ b/lib/images/license/badge/cc-by-nc-nd.png
diff --git a/lib/images/license/badge/cc-by-nc-sa.png b/lib/images/license/badge/cc-by-nc-sa.png
new file mode 100644
index 000000000..0f2a0f107
--- /dev/null
+++ b/lib/images/license/badge/cc-by-nc-sa.png
diff --git a/lib/images/license/badge/cc-by-nc.png b/lib/images/license/badge/cc-by-nc.png
new file mode 100644
index 000000000..5f9821470
--- /dev/null
+++ b/lib/images/license/badge/cc-by-nc.png
diff --git a/lib/images/license/badge/cc-by-nd.png b/lib/images/license/badge/cc-by-nd.png
new file mode 100644
index 000000000..8f317035e
--- /dev/null
+++ b/lib/images/license/badge/cc-by-nd.png
diff --git a/lib/images/license/badge/cc-by-sa.png b/lib/images/license/badge/cc-by-sa.png
new file mode 100644
index 000000000..f0a944e0b
--- /dev/null
+++ b/lib/images/license/badge/cc-by-sa.png
diff --git a/lib/images/license/badge/cc-by.png b/lib/images/license/badge/cc-by.png
new file mode 100644
index 000000000..822491edb
--- /dev/null
+++ b/lib/images/license/badge/cc-by.png
diff --git a/lib/images/license/badge/cc.png b/lib/images/license/badge/cc.png
new file mode 100644
index 000000000..a66f4d1a0
--- /dev/null
+++ b/lib/images/license/badge/cc.png
diff --git a/lib/images/license/badge/publicdomain.png b/lib/images/license/badge/publicdomain.png
new file mode 100644
index 000000000..cedc39c62
--- /dev/null
+++ b/lib/images/license/badge/publicdomain.png
diff --git a/lib/images/license/button/cc-by-nc-nd.png b/lib/images/license/button/cc-by-nc-nd.png
new file mode 100644
index 000000000..072f8cda0
--- /dev/null
+++ b/lib/images/license/button/cc-by-nc-nd.png
diff --git a/lib/images/license/button/cc-by-nc-sa.png b/lib/images/license/button/cc-by-nc-sa.png
new file mode 100644
index 000000000..ed028fed9
--- /dev/null
+++ b/lib/images/license/button/cc-by-nc-sa.png
diff --git a/lib/images/license/button/cc-by-nc.png b/lib/images/license/button/cc-by-nc.png
new file mode 100644
index 000000000..54ebdfbd8
--- /dev/null
+++ b/lib/images/license/button/cc-by-nc.png
diff --git a/lib/images/license/button/cc-by-nd.png b/lib/images/license/button/cc-by-nd.png
new file mode 100644
index 000000000..35eca20cc
--- /dev/null
+++ b/lib/images/license/button/cc-by-nd.png
diff --git a/lib/images/license/button/cc-by-sa.png b/lib/images/license/button/cc-by-sa.png
new file mode 100644
index 000000000..c67509f12
--- /dev/null
+++ b/lib/images/license/button/cc-by-sa.png
diff --git a/lib/images/license/button/cc-by.png b/lib/images/license/button/cc-by.png
new file mode 100644
index 000000000..ecd2abc73
--- /dev/null
+++ b/lib/images/license/button/cc-by.png
diff --git a/lib/images/license/button/cc.png b/lib/images/license/button/cc.png
new file mode 100644
index 000000000..7c0ea70ce
--- /dev/null
+++ b/lib/images/license/button/cc.png
diff --git a/lib/images/license/button/publicdomain.png b/lib/images/license/button/publicdomain.png
new file mode 100644
index 000000000..f6ba77b54
--- /dev/null
+++ b/lib/images/license/button/publicdomain.png
diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php
index 3de0bbd7d..6d942c290 100644
--- a/lib/plugins/config/lang/en/lang.php
+++ b/lib/plugins/config/lang/en/lang.php
@@ -57,6 +57,7 @@ $lang['savedir']     = 'Directory for saving data';
 $lang['start']       = 'Start page name';
 $lang['title']       = 'Wiki title';
 $lang['template']    = 'Template';
+$lang['license']     = 'Under which license should your content be released?';
 $lang['fullpath']    = 'Reveal full path of pages in the footer';
 $lang['recent']      = 'Recent changes';
 $lang['breadcrumbs'] = 'Number of breadcrumbs';
@@ -162,6 +163,8 @@ $lang['ftp____user'] = 'FTP user name for safemode hack';
 $lang['ftp____pass'] = 'FTP password for safemode hack';
 $lang['ftp____root'] = 'FTP root directory for safemode hack';
 
+$lang['license_o_'] = 'None chosen';
+
 /* typography options */
 $lang['typography_o_0'] = 'none';
 $lang['typography_o_1'] = 'Double quotes only';
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index faa8c5e7e..011335913 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -631,6 +631,7 @@ if (!class_exists('setting_multichoice')) {
         foreach ($this->_choices as $choice) {
             $selected = ($value == $choice) ? ' selected="selected"' : '';
             $option = $plugin->getLang($this->_key.'_o_'.$choice);
+            if (!$option && isset($this->lang[$this->_key.'_o_'.$choice])) $option = $this->lang[$this->_key.'_o_'.$choice];
             if (!$option) $option = $choice;
 
             $choice = htmlspecialchars($choice);
diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php
index c087cd767..56a1c43ff 100644
--- a/lib/plugins/config/settings/config.metadata.php
+++ b/lib/plugins/config/settings/config.metadata.php
@@ -84,6 +84,7 @@ $meta['title']    = array('string');
 $meta['start']    = array('string','_pattern' => '!^[^:;/]+$!'); // don't accept namespaces
 $meta['lang']     = array('dirchoice','_dir' => DOKU_INC.'inc/lang/');
 $meta['template'] = array('dirchoice','_dir' => DOKU_INC.'lib/tpl/','_pattern' => '/^[\w-]+$/');
+$meta['license']  = array('license');
 $meta['savedir']  = array('savedir');
 $meta['basedir']  = array('string');
 $meta['baseurl']  = array('string');
diff --git a/lib/plugins/config/settings/extra.class.php b/lib/plugins/config/settings/extra.class.php
index 40c919a12..12e176f35 100644
--- a/lib/plugins/config/settings/extra.class.php
+++ b/lib/plugins/config/settings/extra.class.php
@@ -116,6 +116,25 @@ if (!class_exists('setting_compression')) {
   }
 }
 
+if (!class_exists('setting_license')) {
+  class setting_license extends setting_multichoice {
+
+    var $_choices = array('');      // none choosen
+
+    function initialize($default,$local,$protected) {
+      global $license;
+
+      foreach($license as $key => $data){
+        $this->_choices[] = $key;
+        $this->lang[$this->_key.'_o_'.$key] = $data['name'];
+      }
+
+      parent::initialize($default,$local,$protected);
+    }
+  }
+}
+
+
 if (!class_exists('setting_renderer')) {
   class setting_renderer extends setting_multichoice {
     var $_prompts = array();
diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css
index cadc78c2c..03751b879 100644
--- a/lib/tpl/default/design.css
+++ b/lib/tpl/default/design.css
@@ -171,8 +171,17 @@ div.dokuwiki div#draft__status {
   color: __text_alt__;
 }
 
-/* --------- buttons ------------------- */
+div.dokuwiki form#dw__editform div.license {
+  clear: left;
+  font-size: 90%;
+}
+
+div.dokuwiki p.license {
+  font-size: 90%;
+  text-align: center;
+}
 
+/* --------- buttons ------------------- */
 
 div.dokuwiki input.button,
 div.dokuwiki button.button {
diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php
index 3982618df..5fd3dba65 100644
--- a/lib/tpl/default/main.php
+++ b/lib/tpl/default/main.php
@@ -128,6 +128,8 @@ if (!defined('DOKU_INC')) die();
 
   </div>
 
+  <?php tpl_license(false);?>
+
 </div>
 <?php /*old includehook*/ @include(dirname(__FILE__).'/footer.html')?>