Changeset 11635
- Timestamp:
- Jul 5, 2011, 1:01:28 PM (13 years ago)
- Location:
- extensions/Copyrights
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/Copyrights/TODO
r11625 r11635 1 1 === TODO === 2 - Implement single mode Batch Manager 3 Probably use prefilters combined with "loc_begin_element_set_unit" (found in event tracer) 4 SOURCES: "loc_begin_admin": http://piwigo.org/forum/viewtopic.php?id=17468 5 "use prefilters": http://piwigo.org/forum/viewtopic.php?id=17551&p=2 6 - This is almost done, except that you need to refresh the batch_unit page, to see the updated copyright 7 - Add Icon field to copyrights 8 - Show the copyright when image is displayed 9 (It doesnt show a picture yet, but it does show the name of the copyright) 2 - Add Icon field to copyrights 3 - Show the copyright when image is displayed 4 It doesnt show a picture yet, but it does show the name of the copyright 10 5 11 6 === Bugs === 12 - If you create a new copyright with a name that's already used (fixed??) 7 - We don't check if the CR url has 'http://' (or is this a TODO?) 8 - Go to "unit mode", click "information", and you wont see the copyright... -
extensions/Copyrights/admin.php
r11625 r11635 52 52 'SELECT COUNT(*) 53 53 FROM %s 54 WHERE `name` = '%s'54 WHERE `name` = \'%s\' 55 55 ;', 56 56 COPYRIGHTS_ADMIN, $name); -
extensions/Copyrights/batch_global.tpl
r11423 r11635 1 1 <div id="copyrights"> 2 {'Copyright'|@translate} {html_options name=copyrightID options=$CRoptions} 2 {'Copyright'|@translate} 3 <select name="copyrightID"> 4 <option value="0">--</option> 5 {html_options options=$CRoptions} 6 </select> 3 7 </div> -
extensions/Copyrights/batch_single.php
r11623 r11635 3 3 // Add a prefilter 4 4 add_event_handler('loc_end_element_set_unit', 'CR_set_prefilter_batch_single', 55 ); 5 add_event_handler('loc_ end_element_set_unit', 'CR_batch_single_submit', 50 );5 add_event_handler('loc_begin_element_set_unit', 'CR_batch_single_submit', 50 ); 6 6 7 7 // Change the variables used by the function that changes the template -
extensions/Copyrights/image.php
r11621 r11635 35 35 <td class="value"> 36 36 {if $CR_INFO_NAME} 37 <a target="_blanc" href="{$CR_INFO_URL}" title="{$CR_INFO_NAME} ">{$CR_INFO_NAME}</a>37 <a target="_blanc" href="{$CR_INFO_URL}" title="{$CR_INFO_NAME}: {$CR_INFO_DESCR}">{$CR_INFO_NAME}</a> 38 38 {else}{\'N/A\'|@translate}{/if} 39 39 </td> … … 57 57 // Get the copyright name and url (FROM cr_admin) that belongs to the current media_item (FROM cr_media) 58 58 $query = ' 59 select name, url 59 select name, url, descr 60 60 FROM '.COPYRIGHTS_ADMIN.' NATURAL JOIN '.COPYRIGHTS_MEDIA.' 61 61 WHERE media_id = '.$page['image_id'].' … … 64 64 $result = pwg_query($query); 65 65 $row = pwg_db_fetch_row($result); 66 $name = ''; 67 $url = ''; 68 $descr = ''; 66 69 if(count($row) > 0) { 67 70 $name = $row[0]; 68 71 $url = $row[1]; 69 } 70 else { 71 $name = ''; 72 $url = ''; 72 $descr = $row[2]; 73 73 } 74 74 … … 77 77 array ( 78 78 'CR_INFO_NAME' => $name, 79 'CR_INFO_URL' => $url 79 'CR_INFO_URL' => $url, 80 'CR_INFO_DESCR' => $descr 80 81 )); 81 82 } -
extensions/Copyrights/main.inc.php
r11488 r11635 2 2 /* 3 3 Plugin Name: Copyrights 4 Version: Alpha4 Version: 1.0 5 5 Description: Create copyrights and assign them to your photos. 6 6 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=537 -
extensions/Copyrights/maintain.inc.php
r11084 r11635 80 80 'name' => 'Creative Commons (BY)', 81 81 'url' => 'http://creativecommons.org/licenses/by/3.0/', 82 'descr' => 'This license lets others distribute, remix, tweak, and build 83 upon your work, even commercially, as long as they credit you84 for the original creation. This is the most accommodating of85 licenses offered. Recommended for maximum dissemination and86 use of licensed materials.',82 'descr' => 'This license lets others distribute, remix, tweak, and build ' 83 .'upon your work, even commercially, as long as they credit you ' 84 .'for the original creation. This is the most accommodating of ' 85 .'licenses offered. Recommended for maximum dissemination and ' 86 .'use of licensed materials.', 87 87 'visible' => 1 88 88 ), … … 90 90 'name' => 'Creative Commons (BY-SA)', 91 91 'url' => 'http://creativecommons.org/licenses/by-sa/3.0/', 92 'descr' => 'This license lets others remix, tweak, and build upon your 93 work even for commercial purposes, as long as they credit you94 and license their new creations under the identical terms. This95 license is often compared to “copyleft” free and open source96 software licenses. All new works based on yours will carry the97 same license, so any derivatives will also allow commercial98 use. This is the license used by Wikipedia, and is recommended99 for materials that would benefit from incorporating content100 from Wikipedia and similarly licensed projects.',92 'descr' => 'This license lets others remix, tweak, and build upon your ' 93 .'work even for commercial purposes, as long as they credit you ' 94 .'and license their new creations under the identical terms. This ' 95 .'license is often compared to “copyleft” free and open source ' 96 .'software licenses. All new works based on yours will carry the ' 97 .'same license, so any derivatives will also allow commercial ' 98 .'use. This is the license used by Wikipedia, and is recommended ' 99 .'for materials that would benefit from incorporating content ' 100 .'from Wikipedia and similarly licensed projects.', 101 101 'visible' => 1 102 102 ), … … 104 104 'name' => 'Creative Commons (BY-ND)', 105 105 'url' => 'http://creativecommons.org/licenses/by-nd/3.0/', 106 'descr' => 'This license allows for redistribution, commercial and 107 non-commercial, as long as it is passed along unchanged and in108 whole, with credit to you.',106 'descr' => 'This license allows for redistribution, commercial and ' 107 .'non-commercial, as long as it is passed along unchanged and in ' 108 .'whole, with credit to you.', 109 109 'visible' => 1 110 110 ), … … 112 112 'name' => 'Creative Commons (BY-NC)', 113 113 'url' => 'http://creativecommons.org/licenses/by-nc/3.0/', 114 'descr' => 'This license lets others remix, tweak, and build upon your 115 work non-commercially, and although their new works must also116 acknowledge you and be non-commercial, they don’t have to117 license their derivative works on the same terms.',114 'descr' => 'This license lets others remix, tweak, and build upon your ' 115 .'work non-commercially, and although their new works must also ' 116 .'acknowledge you and be non-commercial, they don’t have to ' 117 .'license their derivative works on the same terms.', 118 118 'visible' => 1 119 119 ), … … 121 121 'name' => 'Creative Commons (BY-NC-SA)', 122 122 'url' => 'http://creativecommons.org/licenses/by-nc-sa/3.0/', 123 'descr' => 'This license lets others remix, tweak, and build upon your 124 work non-commercially, as long as they credit you and license125 their new creations under the identical terms.',123 'descr' => 'This license lets others remix, tweak, and build upon your ' 124 .'work non-commercially, as long as they credit you and license ' 125 .'their new creations under the identical terms.', 126 126 'visible' => 1 127 127 ), … … 129 129 'name' => 'Creative Commons (BY-NC-ND)', 130 130 'url' => 'http://creativecommons.org/licenses/by-nc-nd/3.0/', 131 'descr' => 'This license is the most restrictive of our six main licenses, 132 only allowing others to download your works and share them with133 others as long as they credit you, but they can’t change them134 in any way or use them commercially.',131 'descr' => 'This license is the most restrictive of our six main licenses, ' 132 .'only allowing others to download your works and share them with ' 133 .'others as long as they credit you, but they can’t change them ' 134 .'in any way or use them commercially.', 135 135 'visible' => 1 136 136 )
Note: See TracChangeset
for help on using the changeset viewer.