cs translation small correction

.gitignore

@@ -2,3 +2,6 @@ _build/build.config.php
 config.core.php
 .idea
 nbproject
+_packages/*.*
+!_packages/.gitignore
+!_packages/*.zip

_build/build.transport.php

@@ -34,8 +34,8 @@
 /* define package */
 define('PKG_NAME','Gallery');
 define('PKG_NAME_LOWER','gallery');
-define('PKG_VERSION','1.5.3');
-define('PKG_RELEASE','a2');
+define('PKG_VERSION','1.7.1');
+define('PKG_RELEASE','pl');
 
 /* define sources */
 $root = dirname(dirname(__FILE__)).'/';
@@ -68,8 +68,9 @@
 
 $modx->loadClass('transport.modPackageBuilder','',false, true);
 $builder = new modPackageBuilder($modx);
+$builder->directory = dirname(dirname(__FILE__)).'/_packages/';
 $builder->createPackage(PKG_NAME_LOWER,PKG_VERSION,PKG_RELEASE);
-$builder->registerNamespace(PKG_NAME_LOWER,false,true,'{core_path}components/'.PKG_NAME_LOWER.'/');
+$builder->registerNamespace(PKG_NAME_LOWER,false,true,'{core_path}components/'.PKG_NAME_LOWER.'/','{assets_path}components/'.PKG_NAME_LOWER.'/');
 $modx->log(modX::LOG_LEVEL_INFO,'Created Transport Package and Namespace.');
 
 /* create category */

_build/config.json

@@ -0,0 +1,136 @@
+{
+ "name": "Gallery"
+ ,"lowCaseName": "gallery"
+ ,"description": "Gallery"
+ ,"author": "Shaun McCormick"
+ ,"version": "1.7.1"
+ ,"package":{
+ "actions": [{
+ "id": 1
+ ,"controller": "index"
+ }]
+ ,"menus": [{
+ "text": "gallery"
+ ,"description": "gallery.menu_desc"
+ ,"action": 1
+ ,"parent": "components"
+ }]
+ ,"elements": {
+ "snippets": [{
+ "name": "Gallery"
+ ,"file": "snippet.gallery.php"
+ },{
+ "name": "GalleryAlbums"
+ ,"file": "snippet.galleryalbums.php"
+ },{
+ "name": "GalleryItem"
+ ,"file": "snippet.galleryitem.php"
+ }]
+ ,"chunks": [{
+ "name": "galAlbumRowTpl"
+ },{
+ "name": "galItemThumb"
+ }]
+ }
+ ,"systemSettings": [{
+ "key": "backend_thumb_far"
+ ,"type": "textfield"
+ ,"area": "backend"
+ ,"value": "C"
+ },{
+ "key": "backend_thumb_height"
+ ,"type": "textfield"
+ ,"area": "backend"
+ ,"value": "100"
+ },{
+ "key": "backend_thumb_width"
+ ,"type": "textfield"
+ ,"area": "backend"
+ ,"value": "100"
+ },{
+ "key": "backend_thumb_zoomcrop"
+ ,"type": "combo-boolean"
+ ,"area": "backend"
+ ,"value": 1
+ },{
+ "key": "default_batch_upload_path"
+ ,"type": "textfield"
+ ,"area": "backend"
+ ,"value": "{assets_path}images/"
+ },{
+ "key": "thumbs_prepend_site_url"
+ ,"type": "combo-boolean"
+ ,"area": "backend"
+ ,"value": 0
+ },{
+ "key": "mediaSource"
+ ,"type": "modx-combo-source"
+ ,"area": "backend"
+ ,"value": 1
+ },{
+ "key": "use_richtext"
+ ,"type": "combo-boolean"
+ ,"area": "TinyMCE"
+ ,"value": 0
+ },{
+ "key": "tiny.width"
+ ,"type": "textfield"
+ ,"area": "TinyMCE"
+ ,"value": "95%"
+ },{
+ "key": "tiny.height"
+ ,"type": "textfield"
+ ,"area": "TinyMCE"
+ ,"value": "200"
+ },{
+ "key": "tiny.buttons1"
+ ,"type": "textfield"
+ ,"area": "TinyMCE"
+ ,"value": "undo,redo,selectall,pastetext,pasteword,charmap,separator,image,modxlink,unlink,media,separator,code,help"
+ },{
+ "key": "tiny.buttons2"
+ ,"type": "textfield"
+ ,"area": "TinyMCE"
+ ,"value": "bold,italic,underline,strikethrough,sub,sup,separator,bullist,numlist,outdent,indent,separator,justifyleft,justifycenter,justifyright,justifyfull"
+ },{
+ "key": "tiny.buttons3"
+ ,"type": "textfield"
+ ,"area": "TinyMCE"
+ ,"value": "styleselect,formatselect,separator,styleprops"
+ },{
+ "key": "tiny.buttons4"
+ ,"type": "textfield"
+ ,"area": "TinyMCE"
+ ,"value": ""
+ },{
+ "key": "tiny.buttons5"
+ ,"type": "textfield"
+ ,"area": "TinyMCE"
+ ,"value": ""
+ },{
+ "key": "tiny.custom_plugins"
+ ,"type": "textfield"
+ ,"area": "TinyMCE"
+ ,"value": ""
+ },{
+ "key": "tiny.theme"
+ ,"type": "textfield"
+ ,"area": "TinyMCE"
+ ,"value": ""
+ },{
+ "key": "tiny.theme_advanced_blockformats"
+ ,"type": "textfield"
+ ,"area": "TinyMCE"
+ ,"value": ""
+ },{
+ "key": "tiny.theme_advanced_css_selectors"
+ ,"type": "textfield"
+ ,"area": "TinyMCE"
+ ,"value": ""
+ }]
+ }
+ ,"database": {
+ "tables": ["galItem", "galAlbum", "galAlbumItem", "galAlbumContext", "galTag"]
+ }
+ ,"extensionPackage": {}
+}

_build/data/transport.settings.php

@@ -39,7 +39,7 @@
 $settings['gallery.backend_thumb_height']= $modx->newObject('modSystemSetting');
 $settings['gallery.backend_thumb_height']->fromArray(array(
  'key' => 'gallery.backend_thumb_height',
- 'value' => '100',
+ 'value' => '80',
  'xtype' => 'textfield',
  'namespace' => 'gallery',
  'area' => 'backend',
@@ -90,6 +90,15 @@
  'area' => '',
 ),'',true,true);
 
+$settings['gallery.mediaSource']= $modx->newObject('modSystemSetting');
+$settings['gallery.mediaSource']->fromArray(array(
+ 'key' => 'gallery.mediaSource',
+ 'value' => 1,
+ 'xtype' => 'modx-combo-source',
+ 'namespace' => 'gallery',
+ 'area' => '',
+),'',true,true);
+
 /*
 $settings['gallery.']= $modx->newObject('modSystemSetting');
 $settings['gallery.']->fromArray(array(

_build/resolvers/resolve.dbchanges.php

@@ -55,6 +55,7 @@
  $manager->addIndex('galAlbum','prominent');
 
  $manager->addIndex('galAlbumItem','rank');
+ $manager->addField('galAlbum', 'year'); 
 
  /* 1.5.3+ */
  $manager->addField('galAlbum','cover_filename');

assets/components/gallery/connector.php

@@ -47,7 +47,6 @@
  if ($modx->user->hasSessionContext($modx->context->get('key'))) {
  $_SERVER['HTTP_MODAUTH'] = $_SESSION["modx.{$modx->context->get('key')}.user.token"];
  } else {
- $_SESSION["modx.{$modx->context->get('key')}.user.token"] = 0;
  $_SERVER['HTTP_MODAUTH'] = 0;
  }
  } else {
@@ -61,4 +60,4 @@
 $modx->request->handleRequest(array(
  'processors_path' => $path,
  'location' => '',
-));
+));

assets/components/gallery/css/fileuploader.css

@@ -1,5 +1,11 @@
 .qq-uploader { position:relative; width: 100%;}
 
+.qq-uploader a {
+ display: inline-block;
+ margin-top: 10px;
+ text-decoration: none;
+}
+
 .qq-upload-button {
  display:block; /* or inline-block */
  padding: 7px 0;
@@ -11,6 +17,12 @@
  margin-top: 10px;
  font-weight: bold;
 }
+/* 2.3 style fixes */
+.qq-upload-button.x-btn {
+ border: 0;
+ padding: 10px 15px;
+ text-shadow: none;
+}
 .qq-upload-button-hover {background:#5C7F17;}
 .qq-upload-button-focus {outline:1px dotted black;}
 

assets/components/gallery/css/mgr.css

@@ -6,25 +6,38 @@
 .gal-item-inactive {
  opacity: 0.5;
 }
-.green { color: green; }
-.red { color: red; }
+/* unnecessary as defined in default styles */
+/*.green { color: green; }
+.red { color: red; }*/
 
 .gal-detail-active {
  float: right;
 }
 .gal-view-item-albums {
  overflow:auto;
- border-top: 1px solid #d4d4d4;
- margin-top: 4px;
+ border-top: 1px solid #E4E4E4;
+ margin-top: 7px;
 }
 
 .gal-item-thumb {
  border: 1px solid #ddd;
- padding: 5px 5px 3px;
+ padding: 5px;
 }
 
 .gal-item-update-preview {
  margin: 0 auto;
  text-align: center;
  padding: 2px;
+}
+
+#gal-album-items-detail {
+ border-left: 1px solid #E4E4E4;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ margin-left: 0 !important; /* override default modx theme styles for .x-column */
+}
+
+.modx-browser-thumb-wrap .gal-item-thumb {
+ height: 100px;
 }