Permalink
Browse files

Moving photoannotation to photo_annotation for consistancy w/ codex.

  • Loading branch information...
1 parent c50a829 commit 4b090fbe27550b5f33a1a48fc125bf954578649c @dmolavi dmolavi committed Feb 16, 2011
Showing with 164 additions and 164 deletions.
  1. 0 3.0/modules/{photoannotation → photo_annotation}/controllers/admin_photoannotation.php
  2. 0 3.0/modules/{photoannotation → photo_annotation}/controllers/photoannotation.php
  3. +161 −161 3.0/modules/{photoannotation → photo_annotation}/css/colorpicker.css
  4. 0 3.0/modules/{photoannotation → photo_annotation}/css/photoannotation.css
  5. 0 3.0/modules/{photoannotation → photo_annotation}/helpers/photoannotation.php
  6. 0 3.0/modules/{photoannotation → photo_annotation}/helpers/photoannotation_block.php
  7. 0 3.0/modules/{photoannotation → photo_annotation}/helpers/photoannotation_event.php
  8. 0 3.0/modules/{photoannotation → photo_annotation}/helpers/photoannotation_installer.php
  9. 0 3.0/modules/{photoannotation → photo_annotation}/helpers/photoannotation_theme.php
  10. BIN 3.0/modules/{photoannotation → photo_annotation}/images/blank.gif
  11. BIN 3.0/modules/{photoannotation → photo_annotation}/images/colorpicker_background.png
  12. BIN 3.0/modules/{photoannotation → photo_annotation}/images/colorpicker_hex.png
  13. BIN 3.0/modules/{photoannotation → photo_annotation}/images/colorpicker_hsb_b.png
  14. BIN 3.0/modules/{photoannotation → photo_annotation}/images/colorpicker_hsb_h.png
  15. BIN 3.0/modules/{photoannotation → photo_annotation}/images/colorpicker_hsb_s.png
  16. BIN 3.0/modules/{photoannotation → photo_annotation}/images/colorpicker_indic.gif
  17. BIN 3.0/modules/{photoannotation → photo_annotation}/images/colorpicker_overlay.png
  18. BIN 3.0/modules/{photoannotation → photo_annotation}/images/colorpicker_rgb_b.png
  19. BIN 3.0/modules/{photoannotation → photo_annotation}/images/colorpicker_rgb_g.png
  20. BIN 3.0/modules/{photoannotation → photo_annotation}/images/colorpicker_rgb_r.png
  21. BIN 3.0/modules/{photoannotation → photo_annotation}/images/colorpicker_select.gif
  22. BIN 3.0/modules/{photoannotation → photo_annotation}/images/colorpicker_submit.png
  23. BIN 3.0/modules/{photoannotation → photo_annotation}/images/custom_background.png
  24. BIN 3.0/modules/{photoannotation → photo_annotation}/images/custom_hex.png
  25. BIN 3.0/modules/{photoannotation → photo_annotation}/images/custom_hsb_b.png
  26. BIN 3.0/modules/{photoannotation → photo_annotation}/images/custom_hsb_h.png
  27. BIN 3.0/modules/{photoannotation → photo_annotation}/images/custom_hsb_s.png
  28. BIN 3.0/modules/{photoannotation → photo_annotation}/images/custom_indic.gif
  29. BIN 3.0/modules/{photoannotation → photo_annotation}/images/custom_rgb_b.png
  30. BIN 3.0/modules/{photoannotation → photo_annotation}/images/custom_rgb_g.png
  31. BIN 3.0/modules/{photoannotation → photo_annotation}/images/custom_rgb_r.png
  32. BIN 3.0/modules/{photoannotation → photo_annotation}/images/custom_submit.png
  33. BIN 3.0/modules/{photoannotation → photo_annotation}/images/delete.png
  34. BIN 3.0/modules/{photoannotation → photo_annotation}/images/edit.png
  35. BIN 3.0/modules/{photoannotation → photo_annotation}/images/select.png
  36. BIN 3.0/modules/{photoannotation → photo_annotation}/images/select2.png
  37. BIN 3.0/modules/{photoannotation → photo_annotation}/images/slider.png
  38. 0 3.0/modules/{photoannotation → photo_annotation}/js/jquery.annotate.js
  39. 0 3.0/modules/{photoannotation → photo_annotation}/js/jquery.annotate.min.js
  40. 0 3.0/modules/{photoannotation → photo_annotation}/js/jquery.colorpicker.js
  41. 0 3.0/modules/{photoannotation → photo_annotation}/js/jquery.colorpicker.min.js
  42. 0 3.0/modules/{photoannotation → photo_annotation}/models/items_face.php
  43. 0 3.0/modules/{photoannotation → photo_annotation}/models/items_note.php
  44. 0 3.0/modules/{photoannotation → photo_annotation}/models/items_user.php
  45. 0 3.0/modules/{photoannotation → photo_annotation}/models/photoannotation_notification.php
  46. +3 −3 3.0/modules/{photoannotation → photo_annotation}/module.info
  47. 0 3.0/modules/{photoannotation → photo_annotation}/views/admin_photoannotation.html.php
  48. 0 3.0/modules/{photoannotation → photo_annotation}/views/admin_photoannotation_converter.html.php
  49. 0 ...modules/{photoannotation → photo_annotation}/views/admin_photoannotation_tagsmaintanance.html.php
  50. 0 3.0/modules/{photoannotation → photo_annotation}/views/photoannotation_block.html.php
  51. 0 3.0/modules/{photoannotation → photo_annotation}/views/photoannotation_cloud.html.php
  52. 0 3.0/modules/{photoannotation → photo_annotation}/views/photoannotation_highlight_block.html.php
  53. 0 3.0/modules/{photoannotation → photo_annotation}/views/photoannotation_user_search.html.php
@@ -1,161 +1,161 @@
-.colorpicker {
- width: 356px;
- height: 176px;
- overflow: hidden;
- position: absolute;
- background: url(../images/colorpicker_background.png);
- font-family: Arial, Helvetica, sans-serif;
- display: none;
-}
-.colorpicker_color {
- width: 150px;
- height: 150px;
- left: 14px;
- top: 13px;
- position: absolute;
- background: #f00;
- overflow: hidden;
- cursor: crosshair;
-}
-.colorpicker_color div {
- position: absolute;
- top: 0;
- left: 0;
- width: 150px;
- height: 150px;
- background: url(../images/colorpicker_overlay.png);
-}
-.colorpicker_color div div {
- position: absolute;
- top: 0;
- left: 0;
- width: 11px;
- height: 11px;
- overflow: hidden;
- background: url(../images/colorpicker_select.gif);
- margin: -5px 0 0 -5px;
-}
-.colorpicker_hue {
- position: absolute;
- top: 13px;
- left: 171px;
- width: 35px;
- height: 150px;
- cursor: n-resize;
-}
-.colorpicker_hue div {
- position: absolute;
- width: 35px;
- height: 9px;
- overflow: hidden;
- background: url(../images/colorpicker_indic.gif) left top;
- margin: -4px 0 0 0;
- left: 0px;
-}
-.colorpicker_new_color {
- position: absolute;
- width: 60px;
- height: 30px;
- left: 213px;
- top: 13px;
- background: #f00;
-}
-.colorpicker_current_color {
- position: absolute;
- width: 60px;
- height: 30px;
- left: 283px;
- top: 13px;
- background: #f00;
-}
-.colorpicker input {
- background-color: transparent;
- border: 1px solid transparent;
- position: absolute;
- font-size: 10px;
- font-family: Arial, Helvetica, sans-serif;
- color: #898989;
- top: 4px;
- right: 11px;
- text-align: right;
- margin: 0;
- padding: 0;
- height: 11px;
-}
-.colorpicker_hex {
- position: absolute;
- width: 72px;
- height: 22px;
- background: url(../images/colorpicker_hex.png) top;
- left: 212px;
- top: 142px;
-}
-.colorpicker_hex input {
- right: 6px;
-}
-.colorpicker_field {
- height: 22px;
- width: 62px;
- background-position: top;
- position: absolute;
-}
-.colorpicker_field span {
- position: absolute;
- width: 12px;
- height: 22px;
- overflow: hidden;
- top: 0;
- right: 0;
- cursor: n-resize;
-}
-.colorpicker_rgb_r {
- background-image: url(../images/colorpicker_rgb_r.png);
- top: 52px;
- left: 212px;
-}
-.colorpicker_rgb_g {
- background-image: url(../images/colorpicker_rgb_g.png);
- top: 82px;
- left: 212px;
-}
-.colorpicker_rgb_b {
- background-image: url(../images/colorpicker_rgb_b.png);
- top: 112px;
- left: 212px;
-}
-.colorpicker_hsb_h {
- background-image: url(../images/colorpicker_hsb_h.png);
- top: 52px;
- left: 282px;
-}
-.colorpicker_hsb_s {
- background-image: url(../images/colorpicker_hsb_s.png);
- top: 82px;
- left: 282px;
-}
-.colorpicker_hsb_b {
- background-image: url(../images/colorpicker_hsb_b.png);
- top: 112px;
- left: 282px;
-}
-.colorpicker_submit {
- position: absolute;
- width: 22px;
- height: 22px;
- background: url(../images/colorpicker_submit.png) top;
- left: 322px;
- top: 142px;
- overflow: hidden;
-}
-.colorpicker_focus {
- background-position: center;
-}
-.colorpicker_hex.colorpicker_focus {
- background-position: bottom;
-}
-.colorpicker_submit.colorpicker_focus {
- background-position: bottom;
-}
-.colorpicker_slider {
- background-position: bottom;
-}
+.colorpicker {
+ width: 356px;
+ height: 176px;
+ overflow: hidden;
+ position: absolute;
+ background: url(../images/colorpicker_background.png);
+ font-family: Arial, Helvetica, sans-serif;
+ display: none;
+}
+.colorpicker_color {
+ width: 150px;
+ height: 150px;
+ left: 14px;
+ top: 13px;
+ position: absolute;
+ background: #f00;
+ overflow: hidden;
+ cursor: crosshair;
+}
+.colorpicker_color div {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 150px;
+ height: 150px;
+ background: url(../images/colorpicker_overlay.png);
+}
+.colorpicker_color div div {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 11px;
+ height: 11px;
+ overflow: hidden;
+ background: url(../images/colorpicker_select.gif);
+ margin: -5px 0 0 -5px;
+}
+.colorpicker_hue {
+ position: absolute;
+ top: 13px;
+ left: 171px;
+ width: 35px;
+ height: 150px;
+ cursor: n-resize;
+}
+.colorpicker_hue div {
+ position: absolute;
+ width: 35px;
+ height: 9px;
+ overflow: hidden;
+ background: url(../images/colorpicker_indic.gif) left top;
+ margin: -4px 0 0 0;
+ left: 0px;
+}
+.colorpicker_new_color {
+ position: absolute;
+ width: 60px;
+ height: 30px;
+ left: 213px;
+ top: 13px;
+ background: #f00;
+}
+.colorpicker_current_color {
+ position: absolute;
+ width: 60px;
+ height: 30px;
+ left: 283px;
+ top: 13px;
+ background: #f00;
+}
+.colorpicker input {
+ background-color: transparent;
+ border: 1px solid transparent;
+ position: absolute;
+ font-size: 10px;
+ font-family: Arial, Helvetica, sans-serif;
+ color: #898989;
+ top: 4px;
+ right: 11px;
+ text-align: right;
+ margin: 0;
+ padding: 0;
+ height: 11px;
+}
+.colorpicker_hex {
+ position: absolute;
+ width: 72px;
+ height: 22px;
+ background: url(../images/colorpicker_hex.png) top;
+ left: 212px;
+ top: 142px;
+}
+.colorpicker_hex input {
+ right: 6px;
+}
+.colorpicker_field {
+ height: 22px;
+ width: 62px;
+ background-position: top;
+ position: absolute;
+}
+.colorpicker_field span {
+ position: absolute;
+ width: 12px;
+ height: 22px;
+ overflow: hidden;
+ top: 0;
+ right: 0;
+ cursor: n-resize;
+}
+.colorpicker_rgb_r {
+ background-image: url(../images/colorpicker_rgb_r.png);
+ top: 52px;
+ left: 212px;
+}
+.colorpicker_rgb_g {
+ background-image: url(../images/colorpicker_rgb_g.png);
+ top: 82px;
+ left: 212px;
+}
+.colorpicker_rgb_b {
+ background-image: url(../images/colorpicker_rgb_b.png);
+ top: 112px;
+ left: 212px;
+}
+.colorpicker_hsb_h {
+ background-image: url(../images/colorpicker_hsb_h.png);
+ top: 52px;
+ left: 282px;
+}
+.colorpicker_hsb_s {
+ background-image: url(../images/colorpicker_hsb_s.png);
+ top: 82px;
+ left: 282px;
+}
+.colorpicker_hsb_b {
+ background-image: url(../images/colorpicker_hsb_b.png);
+ top: 112px;
+ left: 282px;
+}
+.colorpicker_submit {
+ position: absolute;
+ width: 22px;
+ height: 22px;
+ background: url(../images/colorpicker_submit.png) top;
+ left: 322px;
+ top: 142px;
+ overflow: hidden;
+}
+.colorpicker_focus {
+ background-position: center;
+}
+.colorpicker_hex.colorpicker_focus {
+ background-position: bottom;
+}
+.colorpicker_submit.colorpicker_focus {
+ background-position: bottom;
+}
+.colorpicker_slider {
+ background-position: bottom;
+}
@@ -1,3 +1,3 @@
-name = "Photo Annotation"
-description = "Allows you to assign tags and notes to areas on your photos. This module is partially compatible with the TagFaces module by rWatcher. This means that notes and faces that you create in either one will be shown and are editable by the other module as well. If you added users to an annotation area though they will only be displayed with the Photo Annotation module. You cannot run both modules at the same time."
-version = 4
+name = "Photo Annotation"
+description = "Allows you to assign tags and notes to areas on your photos. This module is partially compatible with the TagFaces module by rWatcher. This means that notes and faces that you create in either one will be shown and are editable by the other module as well. If you added users to an annotation area though they will only be displayed with the Photo Annotation module. You cannot run both modules at the same time."
+version = 4

2 comments on commit 4b090fb

@shwebstart

Moving directory/ file names from photoannotation to photo_annotation brings following isssue:
Module can be activated, but there are no link to Settings -> Photo annotation and "Add Annotation" in photo page.
There are no error hints in Logfiles in var/logs, upgrader I have also started.

Module Version 4.5 / 5 beta 3 from galleryproject forum node 97699 (with directory/ file names photoannotation) works fine.

Maybe there is an inconsistency by renaming directory/ files with module version on Github?

My Installation - Version: 3.0.6 (Rive Gauche)
Operating system: Linux 3.5.0-23-generic
Apache: Apache/2.2.22 (Ubuntu)
PHP: 5.4.6-1ubuntu1.1
MySQL: 5.5.29-0ubuntu0.12.10.1
Serverauslastung: 0,2 0,5 0,93
Graphics toolkit: graphicsmagick

@bharat
Member
bharat commented on 4b090fb Apr 15, 2013

I did a quick fix in 2e123a7

Please sign in to comment.