Skip to content
Browse files

Merge branch 'master' of git://dev.entermediasoftware.com/entermedia-…

…server
  • Loading branch information...
2 parents d3151fc + 3eed5e6 commit 9798c4e217f0b940e7a3319b0c70f0bd7e63faa7 @livando livando committed Mar 30, 2012
View
4 webapp/WEB-INF/base/emfrontend/components/categorize/index.html
@@ -1,12 +1,10 @@
<script type="text/javascript" src="$home$apphome/components/javascript/jstree/jquery.jstree.js"></script>
<script type="text/javascript" src="$home$apphome/components/javascript/jstree/_lib/jquery.cookie.js"></script>
<script type="text/javascript" src="$home$apphome/components/javascript/jstree/_lib/jquery.hotkeys.js"></script>
-
#if($asset.getId().startsWith("multiedit"))
#set($postfix = 'multi')
#else
- #set($postfix = '$asset.id')
-
+ #set($postfix = $asset.id )
#end
<div id="assetdetailscategorylist$postfix">
#set( $rootpath = "${apphome}/components/categorize")
View
4 webapp/WEB-INF/base/emfrontend/components/categorize/picker.html
@@ -1,11 +1,9 @@
#set( $rootpath = "${apphome}/components/categorize")
-
#if($asset.getId().startsWith("multiedit"))
#set($postfix = 'multi')
#else
- #set($postfix = '$asset.id')
-
+ #set($postfix = $asset.id )
#end
View
11 webapp/WEB-INF/base/emfrontend/views/detaileditor/attachments/files.html
@@ -9,7 +9,7 @@
#set( $files = $attachmentManager.listChildren($context, $mediaarchive, $parentfolder ) )
#foreach($file in $files)
#set( $filesource = "${file.parentsourcepath}/${file.name}")
- <li class="noderow" id="${file.id}_row" data-nodeid="$file.id"><div style="padding-left: ${padding}px"><span class="#if ( $file.folder == 'true' )arrow down #end"></span>#if ( $file.folder == "true" ) <span id="${file.id}_display" class="name folder #if($isleaf) leaf #end">$file.name</span><span id="${file.id}_edit" class="name folder" style="display:none;"><input class="field" type="text" value="$file.name" id="${file.id}_edit_field" /><a class="editsave btn">Save</a><a id="${file.id}" class="editcancel btn">Cancel</a></span>#else<span class="name $!file.fileformat" fileid="${file.id}" sourcepath="$filesource" >$file.name</span>#end<span class="actions">#if ( $file.folder == "true" )<a class="add-folder ir" id="${file.id}">Add New Folder</a><a class="add-file ir" id="${file.id}">Add New File</a><a class="edit ir">Edit</a>#end<a class="delete ir" data-parent="${file.id}">Delete</a></span></div>
+ <li class="noderow" id="${file.id}_row" data-nodeid="$file.id"><div style="padding-left: ${padding}px"><span class="#if ( $file.folder == 'true' )arrow down #end"></span>#if ( $file.folder == "true" ) <span id="${file.id}_display" class="name folder #if($isleaf) leaf #end">$file.name</span><span id="${file.id}_edit" class="name folder" style="display:none;"><input class="field" type="text" value="$file.name" id="${file.id}_edit_field" /><a class="editsave btn">Save</a><a id="${file.id}" class="editcancel btn">Cancel</a></span>#else<span class="name $!file.fileformat" fileid="${file.id}" sourcepath="$filesource" >$file.name</span>#end<span class="actions">#if ( $file.folder == "true" )<a class="download-folder ir tooltip" title="Download Folder" id="${file.id}">Download Folder</a><a class="add-folder ir tooltip" title="Add a new Folder" id="${file.id}">Add New Folder</a><a class="add-file ir tooltip" title="Uplaod a new File" id="${file.id}">Add New File</a><a class="edit ir tooltip" title="Edit Folder Name">Edit</a>#else <a class="download-file ir tooltip" title="Download File" id="${file.id}">Add New Folder</a> #end<a class="delete ir tooltip" title="Delete Folder" data-parent="${file.id}">Delete</a></span></div>
#if($file.folder == "true")
<ul class="open" > ##use cookies to open/close them?
#showattachments($filesource , $depth)
@@ -28,11 +28,11 @@
<div class="ui-widget" >
<div class="ui-widget-header">Attachments</div>
- <div class="ui-widget-content categories-widget no-padding-for-real">
+ <div class="ui-widget-content categories-widget no-padding-for-real of-visible">
<div id="attachments-container">
<div id="tree" class="attachments">
<ul class="open" >
- <li class="noderow" id="toplevel_row" data-nodeid="toplevel"><div style="padding-left: 20px"><span class="arrow down"></span><span class="name folder" fileid="toplevel" sourcepath="$filesource" >Attachments</span><span class="actions"><a class="add-folder ir" id="toplevel">Add New Folder</a><a class="add-file ir" id="toplevel">Add New File</a><a class="edit ir nope">Edit</a><a class="delete ir nope" data-parent="toplevel">Delete</a></span></div>
+ <li class="noderow" id="toplevel_row" data-nodeid="toplevel"><div style="padding-left: 20px"><span class="arrow down"></span><span class="name folder" fileid="toplevel" sourcepath="$filesource" >Attachments</span><span class="actions"><a class="download-folder ir tooltip" title="Download Folder" id="${file.id}">Download Folder</a><a class="add-folder ir tooltip" title="Add a new Folder" id="toplevel">Add New Folder</a><a class="add-file ir tooltip" title="Upload a new File" id="toplevel">Add New File</a><a class="edit ir nope">Edit</a><a class="delete ir nope" data-parent="toplevel">Delete</a></span></div>
<ul class="open" >
#showattachments($asset.sourcePath, 1)
</ul>
@@ -278,7 +278,7 @@
$("#tree .uploadfile").on({
change: function (event) {
- alert("changed");
+ //alert("changed");
var field = $(this);
//var copy = $(this)
var cloned = field.clone(true);
@@ -299,9 +299,8 @@
}
</script>
-<a href="#" onClick="repaint();">Repaint</a>
-asdfdasf
+
<form id="uploadform" action="#">
<div id="here"></div>
View
2 webapp/WEB-INF/base/emfrontend/views/settings/applicationsetup/rules/_site.xconf
@@ -3,7 +3,7 @@
<page>
<property name="oeuseradmintabid">securitytab</property>
<property name="permissiontype">permissionsassets</property>
- <property name="permissionrootpath">/${applicationid}/views/settings/security/rules/xml</property>
+ <property name="permissionrootpath">/${applicationid}/views/settings/applicationsetup/rules/xml</property>
<property name="editPath">/${catalogid}/assets</property>
<property name="subtab">rules</property>

0 comments on commit 9798c4e

Please sign in to comment.
Something went wrong with that request. Please try again.