-
Notifications
You must be signed in to change notification settings - Fork 65
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Issue 387 remplacing links by icons #546
Issue 387 remplacing links by icons #546
Conversation
…ere is already icons for modifying/delete. The most of changes are in ressources/ajax_htmldata folder, 3 news css class (style.css) : div.ImportElement, div.addElement, div.adminHeader, with flexbox
…licensing, usage modules. Most of the changes in the ajax_HTMLdata and ajax_forms and admin file. News css classes : editIcon, AddIcon...
…ax_htmldata files and cataloging.php
…. The ajax_htmldata files of the licensing, organizations, resources and usage modules have been amended, the css classes addIcon,adminAddIcon, removeIcone, AdminRemoveIcon, editIcon, adminEditIcon, adminUploadIcon and alignIcon have been created. alignIcon uses flexbox. Some links remain for a better understanding of users.
…. The ajax_htmldata files of the licensing, organizations, resources and usage modules have been amended, the css classes addIcon,adminAddIcon, removeIcone, AdminRemoveIcon, editIcon, adminEditIcon, adminUploadIcon and alignIcon have been created. alignIcon uses flexbox. Some links remain for a better understanding of users.
…. The ajax_htmldata files of the licensing, organizations, resources and usage modules have been amended, the css classes addIcon,adminAddIcon, removeIcone, AdminRemoveIcon, editIcon, adminEditIcon, adminUploadIcon and alignIcon have been created. alignIcon uses flexbox. Some links remain for a better understanding of users. Update(the 05 march 19) : add icons in the management module
… and fix css in licensing and management
licensing/ajax_htmldata.php
Outdated
@@ -203,7 +203,7 @@ | |||
echo "<td><div id='attachment_short_" . $attachment->attachmentID . "'>" . substr($attachmentText, 0,200); | |||
|
|||
if (strlen($attachmentText) > 200){ | |||
echo "... <a href='javascript:showFullAttachmentText(\"" . $attachment->attachmentID . "\");'>"._("more...")."</a>"; | |||
echo "... <a href='javascript:showFullAtt break;achmentText(\"" . $attachment->attachmentID . "\");'>"._("more...")."</a>"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Typo ?
licensing/js/admin.js
Outdated
@@ -354,7 +354,7 @@ function submitQualifier(){ | |||
|
|||
|
|||
function showAdd(tableName){ | |||
$('#span_new' + tableName).html("<input type='text' name='new" + tableName + "' id='new" + tableName + "' class='adminAddInput' /> <a href='javascript:addData(\"" + tableName + "\");'>"+_("add")+"</a>"); | |||
$('#span_new' + tableName).html("<input type='text' name='new" + tableName + "' id='new" + tableName + "' class='adminAddInput' /> <a href='javascript:addData(\"" + tableName + "\");'><img id='addCurrency' src='images/plus.gif' title='add' /></a>"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Translation
<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Access&entityID=<?php echo $resourceAcquisitionID; ?>&resourceNoteID=&modal=true' class='thickbox'><?php echo _("add new note");?></a> | ||
<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Access&entityID=<?php echo $resourceAcquisitionID; ?>&resourceNoteID=&modal=true' class='thickbox'><?php echo "<div class= 'addIconTab'><img id='Add' class='addIcon' src='images/plus.gif' title= '"._("Add")."' /></div>";?></a> | ||
<?php } | ||
if ($user->canEdit()){?> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems misplaced.
?> | ||
<div class="adminHeader"> | ||
<div></div> | ||
<div class="addElement" style= "padding-bottom: 8px;"><?php echo "<a href='ajax_forms.php?action=getAdminAlertDaysForm&alertDaysInAdvanceID=&height=128&width=260&modal=true' class='thickbox'><img id='addAlertDay' src='images/plus.gif' title='add day'/></a>";?></div> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Translation
<div class="adminRightHeader"><?php echo _("Users");?></div> | ||
<div class="addElement" style="margin-right: 4px"><a href='ajax_forms.php?action=getAdminUserUpdateForm&loginID=&height=275&width=315&modal=true' class='thickbox' id='addUser'><img id='addUserGroup' src='images/plus.gif' title='add User' /></a></div> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Translation
<?php if ($user->canEdit()){ ?> | ||
<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Product&entityID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'><?php echo _("add new note");?></a> | ||
<a href='ajax_forms.php?action=getNoteForm&height=233&width=410&tab=Product&entityID=<?php echo $resourceID; ?>&resourceNoteID=&modal=true' class='thickbox'><?php echo "<div class='addIconTab' ><img id='Add' src='images/plus.gif' title= '"._("Add")."' /></div>";?></a></div> | ||
<?php if ($user->canEdit()){ ?> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems misplaced
…l issues : translation in licensing/js/admin and misplacing in resources/ajax_htmldata/getProductsDetails.php
…resources/ajax_htmldata/getProductsDetails
Hi, I have a couple of comments:
Otherwise I think this is good! I like the icons. :) |
…text identify add icon for email and add icon for day under admin -alert setting ressources module
Hi, |
<div></div> | ||
<div class="addElement" style= "padding-bottom: 8px;"><?php echo "<a href='ajax_forms.php?action=getAdminAlertDaysForm&alertDaysInAdvanceID=&height=128&width=260&modal=true' class='thickbox'><img id='addAlertDay' src='images/plus.gif' title='"._("add day")."'/></a>";?></div> | ||
</div> | ||
<div class="addElement" style= "padding-bottom: 8px;"><?php echo "<div><span class= 'addIconAlert'>Add a day: </span><a href='ajax_forms.php?action=getAdminAlertDaysForm&alertDaysInAdvanceID=&height=128&width=260&modal=true' class='thickbox'><img id='addAlertDay' src='images/plus.gif' title='"._("add day")."'/></a></div>";?></div> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Translation
<div class="addElement"><?php echo "<a href='ajax_forms.php?action=getAdminAlertEmailForm&alertEmailAddressID=&height=128&width=260&modal=true' class='thickbox'><img id='addAlertEmail' src='images/plus.gif' title='"._("add Email")."' /></a>";?></div> | ||
<div class="adminHeaderAlert"> | ||
<?php echo "<div class='adminRightHeader'>"._("Alert Settings")."</div><br>";?> | ||
<div class="addElement"><?php echo "<div><span class= 'addIconAlert'>Add an email: </span><a href='ajax_forms.php?action=getAdminAlertEmailForm&alertEmailAddressID=&height=128&width=260&modal=true' class='thickbox'><img id='addAlertEmail' src='images/plus.gif' title='"._("add Email")."' /></a></div>";?></div></br> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Translation
…s module can now be translated
"Add an email" and "Add a day" in the alert settings / ressources module can, now, be translated. |
Hi Malmousque, |
Hi LibClaire, I'm agree with you. For now, I have done with the icons provided with coral, but we could use others. I will talk about that with matts. |
I think we can safely merge 'update' and 'edit' buttons to only have 'edit'. |
++ for merging update & edit and thus be consistent ! |
I would agree to just having 'edit'. I think it will be cleaner that way |
Hi, |
Hi LibClaire, Yes, of course, I had to miss some "update". |
Hi, |
…n of the buttons titles
I modified the titles of the windows and harmonized the titles of the buttons (because for some, the title of the button and the window was in the same variable). |
This reverts commit 3229d41.
Hi Malmousque, |
Merging this to devel. Thank you @LibClaire and @Malmousque for the good work! |
This PR replaces links, particulary in tabs, by icons into the 5 modules, some icons was already in use in some place, the idea is to improve and make the UX coherent.
5 news CSS classes have been added : .removeIcon .editIcon .updateIcon .addIcon .addIconTab.
All the icons was already in use. Most of them was only in the Resources modules images folder, I add them in the others images folders.
To update

To add

To remove

To edit

Is the update and edit function have a real separate function ?