Browse the code

 

Differences between 601 and 602 on /.
Number of edited files: 1351 (1339 added, 0 deleted and 12 modified)
Revision 602

About 25 days and 12 hours ago.

* Introduced a brand new user-interface (work in progress)
* Added FontAwesome 5.1.0 library
* Started to switch from images icons to FontAwesome
Added file(s) Deleted file(s) Modified file(s)

 

Old New Code
24
24
RewriteCond %{REQUEST_URI} !^/public/([a-z-]+)\.js$
25
25
RewriteCond %{REQUEST_URI} !^/inc/templates/([a-z-]+)/images/.*$
26
26
RewriteCond %{REQUEST_URI} !^/inc/templates/([a-z-]+)/fonts/.*$
 
27
RewriteCond %{REQUEST_URI} !^/inc/libs/fontawesome/.*$
27
28
RewriteCond %{REQUEST_URI} !^/robots.txt?$
28
 
RewriteRule ^(.*)$ index.php [QSA,L]
 
29
RewriteRule ^(.*)$ index.php [QSA,L]
29
30

                                        

 

Old New Code
97
97
            if (strstr($_table, ', '))
98
98
            {
99
99
                $table_ = explode(', ', $_table);
100
 
                $table = '';    
 
100
                $table = '';
101
101

                                        
102
102
                for($i=0; $i<count($table_); $i++)
103
103
                    $table .= '`'.$table_[$i].'`'.
403
403
                $this->time += microtime(true) - $time;
404
404
                return TRUE;
405
405
            }
406
 
            
 
406

                                    
407
407
            $err = $rs->errorInfo();
408
408
            if ($error)
409
409
                $this->error->displayError('An error occured.<br />'.$err[2], 1);
454
454
        return round($this->time, 2);
455
455
    }
456
456
}
457
 
?>
 
457
?>
458
458

                                        

 

Old New Code
848
848
        $temp['poweredby'] = i18n('Powered by CodingTeam %(version)s',
849
849
                             array('version' => '<strong>'.$v.'</strong>'));
850
850

                                        
 
851
        $temp['forge'] = i18n('Forge');
 
852

                                    
851
853
        $temp['link_about'] = i18n('About');
852
854
        $temp['link_tou'] = i18n('Terms of Use');
853
855
        $temp['link_admin'] = i18n('Administration');
995
997
                             'color_700' => '#5A5E6B',
996
998
                             'color_800' => '#4D515C',
997
999
                             'color_900' => '#000');
998
 
        elseif ($colorpalette == 1) // Color palette n°1: blue
999
 
            $palette = array('color_50'  => '#e3f2fd',
1000
 
                             'color_100' => '#bbdefb',
1001
 
                             'color_200' => '#90caf9',
1002
 
                             'color_300' => '#64b5f6',
1003
 
                             'color_400' => '#42a5f5',
1004
 
                             'color_500' => '#2196f3',
1005
 
                             'color_600' => '#1e88e5',
1006
 
                             'color_700' => '#1976d2',
1007
 
                             'color_800' => '#1565c0',
1008
 
                             'color_900' => '#0d47a1');
1009
 
        elseif ($colorpalette == 2) // Color palette n°2: teal
 
1000
        elseif ($colorpalette == 1) // Color palette n°1: teal
1010
1001
            $palette = array('color_50'  => '#e0f2f1',
1011
1002
                             'color_100' => '#b2dfdb',
1012
1003
                             'color_200' => '#80cbc4',
1017
1008
                             'color_700' => '#00796b',
1018
1009
                             'color_800' => '#00695c',
1019
1010
                             'color_900' => '#004d40');
1020
 
        elseif ($colorpalette == 3) // Color palette n°3: grey
 
1011
        elseif ($colorpalette == 2) // Color palette n°2: grey
1021
1012
            $palette = array('color_50'  => '#eceff1',
1022
1013
                             'color_100' => '#cfd8dc',
1023
1014
                             'color_200' => '#b0bec5',
1028
1019
                             'color_700' => '#455a64',
1029
1020
                             'color_800' => '#37474f',
1030
1021
                             'color_900' => '#263238');
1031
 
        elseif ($colorpalette == 4) // Color palette n°4: brown
 
1022
        elseif ($colorpalette == 3) // Color palette n°3: brown
1032
1023
            $palette = array('color_50'  => '#efebe9',
1033
1024
                             'color_100' => '#d7ccc8',
1034
1025
                             'color_200' => '#bcaaa4',
1039
1030
                             'color_700' => '#5d4037',
1040
1031
                             'color_800' => '#4e342e',
1041
1032
                             'color_900' => '#3e2723');
1042
 
        elseif ($colorpalette == 5) // Color palette n°5: cyan
 
1033
        elseif ($colorpalette == 4) // Color palette n°4: cyan
1043
1034
            $palette = array('color_50'  => '#e0f7fa',
1044
1035
                             'color_100' => '#b2ebf2',
1045
1036
                             'color_200' => '#80deea',
1050
1041
                             'color_700' => '#0097a7',
1051
1042
                             'color_800' => '#00838f',
1052
1043
                             'color_900' => '#006064');
1053
 
        elseif ($colorpalette == 6) // Color palette n°6: purple
1054
 
            $palette = array('color_50'  => '#f3e5f5',
1055
 
                             'color_100' => '#e1bee7',
1056
 
                             'color_200' => '#ce93d8',
1057
 
                             'color_300' => '#ba68c8',
1058
 
                             'color_400' => '#ab47bc',
1059
 
                             'color_500' => '#9c27b0',
1060
 
                             'color_600' => '#8e24aa',
1061
 
                             'color_700' => '#7b1fa2',
1062
 
                             'color_800' => '#6a1b9a',
1063
 
                             'color_900' => '#4a148c');
1064
 
        elseif ($colorpalette == 7) // Color palette n°7: green
 
1044
        elseif ($colorpalette == 5) // Color palette n°5: green
1065
1045
            $palette = array('color_50'  => '#e8f5e9',
1066
1046
                             'color_100' => '#c8e6c9',
1067
1047
                             'color_200' => '#a5d6a7',
1072
1052
                             'color_700' => '#388e3c',
1073
1053
                             'color_800' => '#2e7d32',
1074
1054
                             'color_900' => '#1b5e20');
1075
 
        elseif ($colorpalette == 8) // Color palette n°8: orange
1076
 
            $palette = array('color_50'  => '#fbe9e7',
1077
 
                             'color_100' => '#ffccbc',
1078
 
                             'color_200' => '#ffab91',
1079
 
                             'color_300' => '#ff8a65',
1080
 
                             'color_400' => '#ff7043',
1081
 
                             'color_500' => '#ff5722',
1082
 
                             'color_600' => '#f4511e',
1083
 
                             'color_700' => '#e64a19',
1084
 
                             'color_800' => '#d84315',
1085
 
                             'color_900' => '#bf360c');
1086
 
        elseif ($colorpalette == 9) // Color palette n°9: black & white
 
1055
        elseif ($colorpalette == 6) // Color palette n°6: black & white
1087
1056
            $palette = array('color_50'  => '#fafafa',
1088
1057
                             'color_100' => '#f5f5f5',
1089
1058
                             'color_200' => '#eeeeee',
1090
1059

                                        

 

Old New Code
125
125
        else
126
126
        {
127
127
            $user = getUser($_SESSION['id'], $this->ct_db);
 
128
            $firstname =htmlspecialchars($user->getName());
 
129
            $lastname = htmlspecialchars($user->getSurname());
128
130
            $nickname = htmlspecialchars($user->getNickname());
129
131
            $avatar = htmlspecialchars($user->getAvatar());
130
132
            $jid = md5(htmlspecialchars($user->getJid()));
157
159
                                                       $user->getDashboard_lastelement());
158
160

                                        
159
161
            echo '
160
 
              <li class="user" style="background-image: url(\''.$logourl.'\');">
161
 
                <a href="users/show/'.$nickname.'">'.$nickname.'</a>
162
 
              </li>
 
162
            <ul class="userbox">
163
163

                                        
164
 
              <li class="useractions">
165
 
                <a href="dashboard">
166
 
                  <div id="up_dash_elem">'.(($activities > 0) ? '<span>'.$activities.'</span>' : '').'
167
 
                  </div>'.i18n('Dashboard').'</a></li>
 
164
              <li class="useractions last"><a href="users/logout"><i class="fas fa-sign-out-alt"></i></a></li>
168
165

                                        
 
166
              <li class="useractions"><a href="users/briefcase"><i class="fas fa-briefcase"></i></a></li>
 
167

                                    
169
168
              <li class="useractions">
170
169
                <a href="users/messages">
171
170
                  <div id="up_mess_elem">'.(($unread > 0) ? '<span>'.$unread.'</span>' : '').'
172
 
                  </div>'.i18n('Messages').'</a></li>
 
171
                  </div><i class="fas fa-envelope"></i></li>
173
172

                                        
174
 
              <li><a href="users/briefcase">'.i18n('Briefcase').'</a></li>
175
 
              <li><a href="users/register/'.$nickname.'">'.i18n('Edit profile').'</a></li>
176
 
              <li><a href="users/logout">'.i18n('Log out').'</a></li>
 
173
              <li class="useractions">
 
174
                <a href="dashboard">
 
175
                  <div id="up_dash_elem">'.(($activities > 0) ? '<span>'.$activities.'</span>' : '').'
 
176
                  </div><i class="fas fa-newspaper"></i></a></li>
177
177

                                        
 
178
              <li class="user">
 
179
                <img src="'.$logourl.'" alt="avatar" />
 
180
                <strong>'.$firstname.' '.$lastname.'</strong><br />
 
181
                <a href="users/show/'.$nickname.'">@'.$nickname.'</a><br />
 
182
              </li>
178
183

                                        
 
184
            </ul>
 
185

                                    
179
186
            <script type="text/javascript">
180
187

                                        
181
188
initial_title = document.title;
182
189

                                        

 

Old New Code
62
62
        echo '<label for="inputsearch">'.$text.'</label>
63
63
              <input type="text" size="10" maxlength="255" name="keyword"
64
64
                     id="inputsearch" placeholder="'.i18n('Search').'" />
 
65
              <button type="submit"><i class="fas fa-search"></i></button>
65
66
          </div>
66
67

                                        
67
68
        </form>
68
69

                                        
 
70
        <!--
69
71
        <ul id="buttons">
70
72
          <li><a href="projects/add">'.i18n('Add a project').'</a></li>
71
73
          <li><a href="teams/create">'.i18n('Create a group').'</a></li>
72
 
        </ul>';
 
74
        </ul>
 
75
        -->';
73
76
    }
74
77
}
75
78
?>
76
79

                                        

 

Old New Code
21
21
<? if ($nb_prj > 0): ?>
22
22
<? foreach ($projects as $project): ?>
23
23
  <li class="prettylist_browsing">
24
 
    <span class="date"><?=$project['date'];?></span>
25
 
    <span class="download"><?=$project['downloads'];?></span>
 
24
    <span class="date"><i class="fas fa-clock fa-fw"></i><?=$project['date'];?></span>
 
25
    <span class="download"><i class="fas fa-download fa-fw"></i><?=$project['downloads'];?></span>
26
26

                                        
27
27
    <img src="<?=$project['logourl'];?>" alt="<?=$project['dbname'];?>" style="width: 42px;height: 42px;" />
28
28
    <h3><a href="project/<?=$project['dbname'];?>"><?=$project['name'];?></a></h3>
29
29

                                        

 

Old New Code
9
9
    <link href="{tpl:cssdir}print.css" rel="stylesheet" type="text/css" media="print" />
10
10
    <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
11
11
    <link href="{tpl:cssdir}mobile.css" rel="stylesheet" type="text/css" media="(max-width: 800px)" />
 
12
      <link href="http://codingteam.net/inc/libs/fontawesome/css/all.css" rel="stylesheet">
12
13
    <link href="{tpl:logosimages}ct_cube.ico" rel="shortcut icon" />
13
14
  </head>
14
15
  <body>
16
17

                                        
17
18
    <div id="globalmenu">
18
19
      <ul>
19
 
        <li class="title">Forge</li>
 
20
        <li class="title"><i class="fas fa-project-diagram fa-fw"></i> {forge}</li>
20
21

                                        
21
22
        {tpl:notepadmenu}
22
23

                                        
23
 
        {view:head_member}
24
24
      </ul>
25
 
      <div id="footer">
26
 
        <a href="http://codingteam.org">
27
 
          <img src="public/images/logos/ct_cube_material.png" alt="CodingTeam" />
28
 
          CodingTeam
29
 
        </a>
30
 
      </div>
 
25
      <ul id="footer">
 
26
        <li><a href="index/about">{link_about}</a></li>
 
27
        <li><a href="index/tou">{link_tou}</a></li>
 
28
        <li class="second"><a href="http://codingteam.org">{poweredby}</a></li>
 
29
      </ul>
31
30
    </div>
32
31

                                        
33
32
    <div id="header">
34
33
      <div id="header_page">
 
34

                                    
 
35
        <img src="{view:pagelogo}" class="logo" alt="pagelogo" />
35
36
        <h1><a href="/index">{forge_title}</a></h1>
 
37

                                    
36
38
        {view:pagename}
37
39

                                        
 
40
        {view:head_member}
 
41

                                    
38
42
        {view:head_search}
39
43

                                        
40
 
        <img src="{view:pagelogo}" class="logo" alt="pagelogo" />
41
 

                                    
42
44
        <div id="header_menu">
43
45
          {view:pagemenu}
44
46
        </div>
45
47

                                        

 

Old New Code
6
6
  display: none;
7
7
}
8
8

                                        
 
9
#header_page li.user strong, #header_page li.user a {
 
10
  display: none;
 
11
}
 
12

                                    
 
13
#header_menu {
 
14
    overflow: scroll;
 
15
    white-space: nowrap;
 
16
}
 
17

                                    
 
18

                                    
9
19
#content {
10
20
  margin-left: 0%;
11
 
}
 
21
}
12
22

                                        

 

Old New Code
79
79

                                        
80
80
#globalmenu li.title {
81
81
  background-color: {color_600};
82
 
  background-image: url('images/server.png');
83
 
  background-size: 28px 28px;
84
 
  background-position: 10px center;
85
 
  background-repeat: no-repeat;
86
82
  color: {color_300};
87
 
  padding: 0px 0px 0px 45px;
 
83
  padding: 0px 0px 0px 10px;
88
84
  line-height: 47px;
89
85
  font-weight: bold;
90
86
  height: 47px;
 
87
  text-transform: uppercase;
91
88
}
92
89

                                        
93
 
#globalmenu li.user {
94
 
  margin-top: 20px;
95
 
  background-color: {color_600};
96
 
  background-size: 28px 28px;
97
 
  background-position: 10px center;
98
 
  background-repeat: no-repeat;
99
 
  color: {color_300};
100
 
  padding: 0px 0px 0px 45px;
101
 
  line-height: 47px;
102
 
  font-weight: bold;
103
 
  height: 47px;
 
90
#globalmenu li.title i {
 
91
  margin-left: 5px;
 
92
  margin-right: 5px;
104
93
}
105
94

                                        
106
 
#globalmenu li.user a {
107
 
  display: inline;
108
 
  padding: 0;
 
95
#globalmenu li.second {
 
96
  border-top: {color_600} 2px solid;
 
97
  margin-bottom: 30px;
109
98
}
110
99

                                        
111
 
#globalmenu li.user a:hover {
112
 
  background-color: {color_600};
 
100
#globalmenu li.second:after {
 
101
  content: "⁂";
 
102
  width: 1.0em;
 
103
  margin-left: auto;
 
104
  margin-right: auto;
 
105
  display: block;
 
106
  color: {color_400};
 
107
  margin-top: 10px;
113
108
}
114
109

                                        
115
 
#globalmenu li.useractions div#up_dash_elem span, #globalmenu li.useractions div#up_mess_elem span {
116
 
  float: right;
117
 
  background-color: {color_600};
118
 
  padding: 2px 5px 2px 5px;
119
 
  font-size: 0.96em;
120
 
  line-height: 1.0em;
121
 
  border-radius: 5px;
122
 
}
123
 

                                    
124
 
#globalmenu #footer {
 
110
#globalmenu ul#footer {
125
111
  bottom: 0px;
126
112
  position: absolute;
127
 
  margin-bottom: 5px;
128
 
  font-size: 0.95em;
129
 
  line-height: 14px;
 
113
  width: 100%;
130
114
}
131
115

                                        
132
 
#globalmenu #footer a {
133
 
  color: {color_300};
134
 
  display: block;
 
116
#globalmenu ul#footer li {
 
117
  font-size: 0.90em;
135
118
}
136
119

                                        
137
 
#globalmenu #footer a {
138
 
  text-decoration: none;
139
 
  color: {color_300};
140
 
}
141
 

                                    
142
 
#globalmenu #footer img {
143
 
  width: 14px;
144
 
  height: 14px;
145
 
  float: left;
146
 
  margin-right: 5px;
147
 
  margin-left: 10px;
148
 
}
149
 

                                    
150
120
/* HEADER */
151
121
#header {
152
122
  box-shadow: 0px 1px 1px {color_300};
168
138
  line-height: 47px;
169
139
  font-size: 1.1em;
170
140
  font-weight: bold;
 
141
  text-transform: uppercase;
171
142
  float: left;
172
143
  color: {color_700};
173
144
}
174
145

                                        
175
 
#header_page h1:first-child a {
176
 
  margin-left: 12%;
177
 
}
178
 

                                    
179
 
#header_page h1:nth-child(2) a:before {
 
146
#header_page h1:nth-child(3) a:before {
180
147
  content: '/';
181
148
  margin-right: 5px;
182
149
}
188
155
#header_page img.logo {
189
156
  width: 40px;
190
157
  height: 40px;
191
 
  display: block;
192
 
  margin-left: 50%;
 
158
  margin-left: 12%;
 
159
  padding-right: 10px;
193
160
  padding-top: 7px;
 
161
  float: left;
194
162
}
195
163

                                        
196
164

                                        
 
165
/* HEADER USER BAR */
 
166
#header_page ul.userbox {
 
167
  list-style-type: none;
 
168
  list-style-image: none;
 
169
  float: right;
 
170
  padding-top: 0;
 
171
  margin-left: 40px;
 
172
}
 
173

                                    
 
174
#header_page ul.userbox li {
 
175
  float: right;
 
176
}
 
177

                                    
 
178
#header_page li.user {
 
179
  color: {color_400};
 
180
  font-weight: bold;
 
181
  margin-top: 5px;
 
182
}
 
183

                                    
 
184
#header_page li.user img {
 
185
  width: 35px;
 
186
  height: 35px;
 
187
  border-radius: 15px;
 
188
  margin-right: 10px;
 
189
  float: left;
 
190
}
 
191

                                    
 
192
#header_page li.user a {
 
193
  font-size: 0.80em;
 
194
}
 
195

                                    
 
196
#header_page li.user strong {
 
197
  display: inline-block;
 
198
  max-width: 100px;
 
199
  height: 1.0em;
 
200
  overflow: hidden;
 
201
  white-space: nowrap;
 
202
  text-overflow: ellipsis;
 
203
}
 
204

                                    
 
205
#header_page li.useractions div#up_dash_elem span, #header_page li.useractions div#up_mess_elem span {
 
206
  margin-top: 24px;
 
207
  margin-left: 25px;
 
208
  position: absolute;
 
209
  color: {color_100};
 
210
  background-color: {color_500};
 
211
  padding: 2px 5px 2px 5px;
 
212
  font-size: 0.75em;
 
213
  line-height: 0.75em;
 
214
  border-radius: 5px;
 
215
}
 
216

                                    
 
217
#header_page li.useractions i {
 
218
  width: 16px;
 
219
  height: 16px;
 
220
  margin-left: 20px;
 
221
  margin-top: 10px;
 
222
  font-size: 1.0em;
 
223
}
 
224

                                    
 
225
#header_page li.last {
 
226
  padding-right: 40px;
 
227
}
 
228

                                    
197
229
/* HEADER SEARCH BAR */
198
230
#header_page form {
199
231
  float: right;
204
236
#header_page form div.input {
205
237
  height: 29px;
206
238
  border: 1px {color_300} solid;
207
 
  background-color: {color_50};
208
 
  background-image: url('/public/images/icons/search.png');
209
 
  background-position: 98% center;
210
 
  background-repeat: no-repeat;
211
239
  line-height: 29px;
 
240
  border-radius: 15px;
 
241
  font-size: 0.90em;
212
242
}
213
243

                                        
 
244
#header_page form div.input button {
 
245
  margin-right: 10px;
 
246
  background-color: #fff;
 
247
}
 
248

                                    
214
249
#header_page form div.input label {
215
250
  background-color: {color_200};
216
251
  color: {color_600};
217
 
  padding: 3px 10px 3px 10px;
218
 
  margin-left: 2px;
 
252
  padding: 5px 10px 5px 10px;
 
253
  margin-left: 1px;
 
254
  margin-right: 10px;
 
255
  border-top-left-radius: 15px;
 
256
  border-bottom-left-radius: 15px;
219
257
}
220
258

                                        
221
259
#header_page form div.input input {
222
260

                                        

 

Old New Code
572
572
}
573
573

                                        
574
574
li.prettylist_browsing span.date, li.prettylist_browsing span.download {
575
 
  background-repeat: no-repeat;
576
 
  background-position: left center;
577
 
  padding-left: 20px;
578
575
  margin-left: 30px;
579
576
  float: right;
580
577
}
581
578

                                        
 
579
li.prettylist_browsing span.date i, li.prettylist_browsing span.download i {
 
580
  margin-right: 5px;
 
581
}
 
582

                                    
582
583
li.prettylist_browsing span.download {
583
584
  font-weight: bold;
584
 
  background-image: url('../../../public/images/icons/project-download.png');
585
585
}
586
586

                                        
587
587
li.prettylist_browsing span.date {
588
 
  background-image: url('../../../public/images/icons/project-timeline.png');
589
588
}
590
589

                                        
591
590
@media (max-width: 800px) {
592
591