Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master
This commit is contained in:
		
				commit
				
					
						b2e6ef84e9
					
				
			
		
					 5 changed files with 73 additions and 21 deletions
				
			
		|  | @ -110,18 +110,6 @@ nav#dokuwiki__pagetools { | ||||||
|                     margin-top: 1em; |                     margin-top: 1em; | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
| 
 |  | ||||||
|             &.plugin_move_page { |  | ||||||
|                 a { |  | ||||||
|                     .btn-hover(); |  | ||||||
| 
 |  | ||||||
|                     color: @ini_nav_menu_color; |  | ||||||
| 
 |  | ||||||
|                     * { |  | ||||||
|                         color: inherit; |  | ||||||
|                     } |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
							
								
								
									
										3
									
								
								images/tools/40-pdf-file.svg
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								images/tools/40-pdf-file.svg
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,3 @@ | ||||||
|  | <svg viewBox="0 0 24 24"> | ||||||
|  |     <path d="M14,9H19.5L14,3.5V9M7,2H15L21,8V20A2,2 0 0,1 19,22H7C5.89,22 5,21.1 5,20V4A2,2 0 0,1 7,2M11.93,12.44C12.34,13.34 12.86,14.08 13.46,14.59L13.87,14.91C13,15.07 11.8,15.35 10.53,15.84V15.84L10.42,15.88L10.92,14.84C11.37,13.97 11.7,13.18 11.93,12.44M18.41,16.25C18.59,16.07 18.68,15.84 18.69,15.59C18.72,15.39 18.67,15.2 18.57,15.04C18.28,14.57 17.53,14.35 16.29,14.35L15,14.42L14.13,13.84C13.5,13.32 12.93,12.41 12.53,11.28L12.57,11.14C12.9,9.81 13.21,8.2 12.55,7.54C12.39,7.38 12.17,7.3 11.94,7.3H11.7C11.33,7.3 11,7.69 10.91,8.07C10.54,9.4 10.76,10.13 11.13,11.34V11.35C10.88,12.23 10.56,13.25 10.05,14.28L9.09,16.08L8.2,16.57C7,17.32 6.43,18.16 6.32,18.69C6.28,18.88 6.3,19.05 6.37,19.23L6.4,19.28L6.88,19.59L7.32,19.7C8.13,19.7 9.05,18.75 10.29,16.63L10.47,16.56C11.5,16.23 12.78,16 14.5,15.81C15.53,16.32 16.74,16.55 17.5,16.55C17.94,16.55 18.24,16.44 18.41,16.25M18,15.54L18.09,15.65C18.08,15.75 18.05,15.76 18,15.78H17.96L17.77,15.8C17.31,15.8 16.6,15.61 15.87,15.29C15.96,15.19 16,15.19 16.1,15.19C17.5,15.19 17.9,15.44 18,15.54M8.83,17C8.18,18.19 7.59,18.85 7.14,19C7.19,18.62 7.64,17.96 8.35,17.31L8.83,17M11.85,10.09C11.62,9.19 11.61,8.46 11.78,8.04L11.85,7.92L12,7.97C12.17,8.21 12.19,8.53 12.09,9.07L12.06,9.23L11.9,10.05L11.85,10.09Z" /> | ||||||
|  | </svg> | ||||||
| After Width: | Height: | Size: 1.3 KiB | 
							
								
								
									
										3
									
								
								images/tools/41-format-paint.svg
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								images/tools/41-format-paint.svg
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,3 @@ | ||||||
|  | <svg viewBox="0 0 24 24"> | ||||||
|  |     <path d="M18,4V3A1,1 0 0,0 17,2H5A1,1 0 0,0 4,3V7A1,1 0 0,0 5,8H17A1,1 0 0,0 18,7V6H19V10H9V21A1,1 0 0,0 10,22H12A1,1 0 0,0 13,21V12H21V4H18Z" /> | ||||||
|  | </svg> | ||||||
| After Width: | Height: | Size: 183 B | 
							
								
								
									
										3
									
								
								images/tools/43-file-delimeted.svg
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								images/tools/43-file-delimeted.svg
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,3 @@ | ||||||
|  | <svg viewBox="0 0 24 24"> | ||||||
|  |     <path d="M13,9H18.5L13,3.5V9M6,2H14L20,8V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V4C4,2.89 4.89,2 6,2M14,15V11H10V15H12.3C12.6,17 12,18 9.7,19.38L10.85,20.2C13,19 14,16 14,15Z" /> | ||||||
|  | </svg> | ||||||
| After Width: | Height: | Size: 217 B | 
|  | @ -21,16 +21,71 @@ | ||||||
|                          ) |                          ) | ||||||
|                      ); |                      ); | ||||||
| 
 | 
 | ||||||
|                      // the page tools can be amended through a custom plugin hook
 | 
 | ||||||
|                      $evt = new Doku_Event('TEMPLATE_PAGETOOLS_DISPLAY', $data); |                 foreach ($data['items'] as $k => $html) { | ||||||
|                      if($evt->advise_before()){ |                     if ($html) { | ||||||
|                         foreach($evt->data['items'] as $k => $html) { |                         echo "<li>$html</li>"; | ||||||
|                             if($html) |                     } | ||||||
|                                 echo "<li>$html</li>"; |                 } | ||||||
|  | 
 | ||||||
|  |                 /** | ||||||
|  |                  * ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | ||||||
|  |                  * Begin shims as a temporary solution until the svg-approach is mainlined and the plugins have adapted | ||||||
|  |                  * ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | ||||||
|  |                  */ | ||||||
|  |                 global $ACT; | ||||||
|  |                 if (act_clean($ACT) === 'show') { | ||||||
|  |                     /** @var action_plugin_move_rename $move */ | ||||||
|  |                     $move = plugin_load('action', 'move_rename'); | ||||||
|  |                     if ($move && $move->getConf('pagetools_integration')) { | ||||||
|  |                         $attr = array( | ||||||
|  |                             'style' => 'background-image: none;', | ||||||
|  |                         ); | ||||||
|  |                         $item = \dokuwiki\template\sprintdoc\tpl::pageToolItem('', $move->getLang('renamepage'), __DIR__ . '/../images/tools/41-format-paint.svg', $attr); | ||||||
|  |                         echo '<li class="plugin_move_page">' . $item . '</li>'; | ||||||
|  |                     } | ||||||
|  | 
 | ||||||
|  |                     /** @var action_plugin_odt_export $odt */ | ||||||
|  |                     $odt = plugin_load('action', 'odt_export'); | ||||||
|  |                     if ($odt && $odt->getConf('showexportbutton')) { | ||||||
|  |                         global $ID, $REV; | ||||||
|  |                         $params = array('do' => 'export_odt'); | ||||||
|  |                         if ($REV) { | ||||||
|  |                             $params['rev'] = $REV; | ||||||
|                         } |                         } | ||||||
|                      } |                         $attr = array( | ||||||
|                      $evt->advise_after(); |                             'class' => 'action export_pdf', | ||||||
|                      unset($data); |                             'style' => 'background-image: none;', | ||||||
|  |                         ); | ||||||
|  |                         $svg = __DIR__ . '/../images/tools/43-file-delimeted.svg'; | ||||||
|  |                         $item = \dokuwiki\template\sprintdoc\tpl::pageToolItem(wl($ID, $params, false, '&'), $odt->getLang('export_odt_button'), $svg, $attr); | ||||||
|  |                         echo '<li>' . $item . '</li>'; | ||||||
|  |                     } | ||||||
|  | 
 | ||||||
|  |                     /** @var action_plugin_dw2pdf $dw2pdf */ | ||||||
|  |                     $dw2pdf = plugin_load('action', 'dw2pdf'); | ||||||
|  |                     if ($dw2pdf && $dw2pdf->getConf('showexportbutton')) { | ||||||
|  |                         global $ID, $REV; | ||||||
|  | 
 | ||||||
|  |                         $params = array('do' => 'export_pdf'); | ||||||
|  |                         if ($REV) { | ||||||
|  |                             $params['rev'] = $REV; | ||||||
|  |                         } | ||||||
|  |                         $attr = array( | ||||||
|  |                             'class' => 'action export_pdf', | ||||||
|  |                             'style' => 'background-image: none;', | ||||||
|  |                         ); | ||||||
|  |                         $svg = __DIR__ . '/../images/tools/40-pdf-file.svg'; | ||||||
|  |                         $item = \dokuwiki\template\sprintdoc\tpl::pageToolItem(wl($ID, $params, false, '&'), $dw2pdf->getLang('export_pdf_button'), $svg, $attr); | ||||||
|  |                         echo '<li>' . $item . '</li>'; | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |                 /** | ||||||
|  |                  * ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | ||||||
|  |                  * End of shims | ||||||
|  |                  * ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | ||||||
|  |                  */ | ||||||
|  | 
 | ||||||
|                 ?>
 |                 ?>
 | ||||||
|             </ul> |             </ul> | ||||||
|         </div> |         </div> | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Silke Pisulla
				Silke Pisulla